diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2015-06-22 16:15:29 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-06-25 22:17:55 -0400 |
| commit | c9bb942e2f91d9f8e5f25ed1961eba2d64f65b8d (patch) | |
| tree | 727c74825b6b09abddfb19b1ab7232e1d02d068c /configs/MSI_Primo81_defconfig | |
| parent | 3c85c8b9f91334b001837123ffaba0a17cde51eb (diff) | |
Move default y configs out of arch/board Kconfig
Some archs/boards specify their own default by pre-defining the config
which causes the Kconfig system to mix up the order of the configs in
the defconfigs... This will cause merge pain if allowed to proliferate.
Remove the configs that behave this way from the archs.
A few configs still remain, but that is because they only exist as
defaults and do not have a proper Kconfig entry. Those appear to be:
SPIFLASH
DISPLAY_BOARDINFO
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
[trini: rastaban, am43xx_evm_usbhost_boot, am43xx_evm_ethboot updates,
drop DM_USB from MSI_Primo81 as USB_MUSB_SUNXI isn't converted yet to DM]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/MSI_Primo81_defconfig')
| -rw-r--r-- | configs/MSI_Primo81_defconfig | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig index e6888a176a4..5c633c72196 100644 --- a/configs/MSI_Primo81_defconfig +++ b/configs/MSI_Primo81_defconfig @@ -3,13 +3,23 @@ CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN6I=y CONFIG_DRAM_CLK=360 CONFIG_DRAM_ZQ=122 +CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" +CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" +CONFIG_AXP_GPIO=y CONFIG_VIDEO_LCD_MODE="x:768,y:1024,depth:18,pclk_khz:66000,le:56,ri:60,up:30,lo:36,hs:64,vs:50,sync:3,vmode:0" CONFIG_VIDEO_LCD_BL_EN="PA25" CONFIG_VIDEO_LCD_BL_PWM="PH13" CONFIG_VIDEO_LCD_PANEL_MIPI_4_LANE_513_MBPS_VIA_SSD2828=y +CONFIG_USB_MUSB_SUNXI=y # CONFIG_USB_KEYBOARD is not set CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-primo81" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL=y +CONFIG_CMD_SETEXPR=y +CONFIG_CMD_NET=y +CONFIG_DM_ETH=y +CONFIG_NETDEVICES=y +CONFIG_DM_SERIAL=y CONFIG_AXP221_DLDO1_VOLT=3300 CONFIG_VIDEO_LCD_SSD2828_TX_CLK=27 CONFIG_VIDEO_LCD_SSD2828_RESET="PA26" @@ -17,7 +27,4 @@ CONFIG_VIDEO_LCD_SPI_CS="PH9" CONFIG_VIDEO_LCD_SPI_SCLK="PH10" CONFIG_VIDEO_LCD_SPI_MOSI="PH11" CONFIG_VIDEO_LCD_SPI_MISO="PH12" -CONFIG_AXP_GPIO=y -CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" -CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" -CONFIG_USB_MUSB_SUNXI=y +CONFIG_USB=y |