diff options
| author | Tom Rini <trini@konsulko.com> | 2015-06-01 20:47:23 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-06-02 12:53:41 (GMT) |
| commit | 563e53efaadd76def21612bcf9f0236d870b6e68 (patch) | |
| tree | 0d66d466f2c9a4cd1f6356fe889a60429745ec13 /configs/ga10h_v1_1_defconfig | |
| parent | 656ae05273419c344c11466de72476455793d6b6 (diff) | |
| parent | 9ba9e85f3f1cc2e7d8b387a03c50eb067d915e0a (diff) | |
| download | u-boot-563e53efaadd76def21612bcf9f0236d870b6e68.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Fixup include/configs/unipher.h to not set CONFIG_LIB_RAND
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/ga10h_v1_1_defconfig')
| -rw-r--r-- | configs/ga10h_v1_1_defconfig | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/configs/ga10h_v1_1_defconfig b/configs/ga10h_v1_1_defconfig index 3eca023..3beed58 100644 --- a/configs/ga10h_v1_1_defconfig +++ b/configs/ga10h_v1_1_defconfig @@ -1,29 +1,23 @@ -# The ga10h is an 10" tablet with an A33 or A23 soc, 1G RAM, 8G or 16G nand, -# sdio wifi, 2 micro usb ports, 1 otg and 1 host and 1 micro sd slot. -# -# This defconfig is for the v1.1 pcb with an a33 soc. -CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5" -CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ippo-q8h-v1.2-lcd1024x600" -CONFIG_USB_MUSB_SUNXI=y +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN8I_A33=y +CONFIG_DRAM_CLK=432 +CONFIG_DRAM_ZQ=15291 +CONFIG_DRAM_ODT_EN=y CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" CONFIG_AXP_GPIO=y CONFIG_VIDEO_LCD_MODE="x:1024,y:600,depth:18,pclk_khz:52000,le:138,ri:162,up:22,lo:10,hs:20,vs:3,sync:3,vmode:0" -CONFIG_VIDEO_LCD_PANEL_LVDS=y CONFIG_VIDEO_LCD_DCLK_PHASE=0 CONFIG_VIDEO_LCD_POWER="PH7" CONFIG_VIDEO_LCD_BL_EN="PH6" CONFIG_VIDEO_LCD_BL_PWM="PH0" -#CONFIG_VIDEO_LCD_BL_PWM_ACTIVE_LOW=n -CONFIG_ARM=y -CONFIG_ARCH_SUNXI=y -CONFIG_MACH_SUN8I_A33=y -CONFIG_DRAM_CLK=432 -# zq = 0x3bbb -CONFIG_DRAM_ZQ=15291 -CONFIG_DRAM_ODT_EN=y -# Wifi power +CONFIG_VIDEO_LCD_PANEL_LVDS=y +CONFIG_USB_MUSB_SUNXI=y +CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ippo-q8h-v1.2-lcd1024x600" +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5" +CONFIG_CMD_SETEXPR=y +CONFIG_CMD_NET=y CONFIG_AXP221_DLDO1_VOLT=3300 -# aldo1 is connected to VCC-IO, VCC-PD, VCC-USB and VCC-HP CONFIG_AXP221_ALDO1_VOLT=3000 |