V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

sunxi: Add environment settings to make extlinux.conf booting work 

Automatic booting using an extlinux.conf file requires various environment
variables to be set.

Also modify CONFIG_SYS_LOAD_ADDR and CONFIG_STANDALONE_LOAD_ADDR to match
the value chosen for kernel_addr_r, see the added comment for why the new
value is chosen.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
Hans de Goede 2014-08-01 09:37:58 +02:00
parent 2ec3a612f4
commit 846e325448
23 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
board/sunxi/Kconfig
View File

@ -36,4 +36,7 @@ config SYS_SOC
string string
default "sunxi" default "sunxi"
config FTDFILE
string "Default ftdfile env setting for this board"
endif endif

1
configs/A10-OLinuXino-Lime_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="A10_OLINUXINO_L,SPL,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="A10_OLINUXINO_L,SPL,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
CONFIG_FTDFILE="sun4i-a10-olinuxino-lime.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN4I=y +S:CONFIG_TARGET_SUN4I=y

1
configs/A10s-OLinuXino-M_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="A10S_OLINUXINO_M,SPL,AXP152_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPB(10)" CONFIG_SYS_EXTRA_OPTIONS="A10S_OLINUXINO_M,SPL,AXP152_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPB(10)"
CONFIG_FTDFILE="sun5i-a10s-olinuxino-micro.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN5I=y +S:CONFIG_TARGET_SUN5I=y

1
configs/A13-OLinuXinoM_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINOM,SPL,CONS_INDEX=2,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)" CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINOM,SPL,CONS_INDEX=2,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)"
CONFIG_FTDFILE="sun5i-a13-olinuxino-micro.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN5I=y +S:CONFIG_TARGET_SUN5I=y

1
configs/A13-OLinuXino_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINO,SPL,CONS_INDEX=2,AXP209_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)" CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINO,SPL,CONS_INDEX=2,AXP209_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)"
CONFIG_FTDFILE="sun5i-a13-olinuxino.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN5I=y +S:CONFIG_TARGET_SUN5I=y

1
configs/A20-OLinuXino_MICRO_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_M,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_M,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
CONFIG_FTDFILE="sun7i-a20-olinuxino-micro.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN7I=y +S:CONFIG_TARGET_SUN7I=y

1
configs/Auxtek-T004_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AUXTEK_T004,SPL,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)" CONFIG_SYS_EXTRA_OPTIONS="AUXTEK_T004,SPL,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)"
CONFIG_FTDFILE="sun5i-a10s-auxtek-t004.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN5I=y +S:CONFIG_TARGET_SUN5I=y

1
configs/Bananapi_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="BANANAPI,SPL,AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="BANANAPI,SPL,AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
CONFIG_FTDFILE="sun7i-a20-bananapi.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN7I=y +S:CONFIG_TARGET_SUN7I=y

1
configs/Cubieboard2_FEL_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL_FEL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL_FEL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
CONFIG_FTDFILE="sun7i-a20-cubieboard2.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN7I=y +S:CONFIG_TARGET_SUN7I=y

1
configs/Cubieboard2_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
CONFIG_FTDFILE="sun7i-a20-cubieboard2.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN7I=y +S:CONFIG_TARGET_SUN7I=y

1
configs/Cubieboard_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD,SPL,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD,SPL,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
CONFIG_FTDFILE="sun4i-a10-cubieboard.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN4I=y +S:CONFIG_TARGET_SUN4I=y

1
configs/Cubietruck_FEL_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
CONFIG_FTDFILE="sun7i-a20-cubietruck.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN7I=y +S:CONFIG_TARGET_SUN7I=y

1
configs/Cubietruck_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
CONFIG_FTDFILE="sun7i-a20-cubietruck.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN7I=y +S:CONFIG_TARGET_SUN7I=y

1
configs/Linksprite_pcDuino3_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PCDUINO3,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="PCDUINO3,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
CONFIG_FTDFILE="sun7i-a20-pcduino3.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN7I=y +S:CONFIG_TARGET_SUN7I=y

1
configs/Mele_A1000G_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000G,SPL,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000G,SPL,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
CONFIG_FTDFILE="sun4i-a10-a1000.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN4I=y +S:CONFIG_TARGET_SUN4I=y

1
configs/Mele_A1000_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000,SPL,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000,SPL,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
CONFIG_FTDFILE="sun4i-a10-a1000.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN4I=y +S:CONFIG_TARGET_SUN4I=y

1
configs/Mini-X-1Gb_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="MINI_X_1GB,SPL,AXP209_POWER,USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="MINI_X_1GB,SPL,AXP209_POWER,USB_EHCI"
CONFIG_FTDFILE="sun4i-a10-mini-xplus.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN4I=y +S:CONFIG_TARGET_SUN4I=y

1
configs/Mini-X_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="MINI_X,SPL,AXP209_POWER,USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="MINI_X,SPL,AXP209_POWER,USB_EHCI"
CONFIG_FTDFILE="sun4i-a10-mini-xplus.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN4I=y +S:CONFIG_TARGET_SUN4I=y

1
configs/ba10_tv_box_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="BA10_TV_BOX,SPL,AXP209_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS1_GPIO=SUNXI_GPH(12)" CONFIG_SYS_EXTRA_OPTIONS="BA10_TV_BOX,SPL,AXP209_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS1_GPIO=SUNXI_GPH(12)"
CONFIG_FTDFILE="sun4i-a10-ba10-tvbox.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN4I=y +S:CONFIG_TARGET_SUN4I=y

1
configs/i12-tvbox_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="I12_TVBOX,SPL,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="I12_TVBOX,SPL,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
CONFIG_FTDFILE="sun7i-a20-i12-tvbox.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN7I=y +S:CONFIG_TARGET_SUN7I=y

1
configs/qt840a_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="QT840A,SPL,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="QT840A,SPL,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
CONFIG_FTDFILE="sun7i-a20-i12-tvbox.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN7I=y +S:CONFIG_TARGET_SUN7I=y

1
configs/r7-tv-dongle_defconfig
View File

@ -1,4 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="R7DONGLE,SPL,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)" CONFIG_SYS_EXTRA_OPTIONS="R7DONGLE,SPL,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)"
CONFIG_FTDFILE="sun5i-a10s-r7-tv-dongle.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN5I=y +S:CONFIG_TARGET_SUN5I=y

18
include/configs/sunxi-common.h
View File

@ -100,10 +100,10 @@
/* Boot Argument Buffer Size */ /* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_LOAD_ADDR 0x48000000 /* default load address */ #define CONFIG_SYS_LOAD_ADDR 0x42000000 /* default load address */
/* standalone support */ /* standalone support */
#define CONFIG_STANDALONE_LOAD_ADDR 0x48000000 #define CONFIG_STANDALONE_LOAD_ADDR 0x42000000
#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_HZ 1000
@ -217,6 +217,16 @@
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#include <config_distro_defaults.h> #include <config_distro_defaults.h>
/* 256M RAM (minimum), 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
* 1M script, 1M pxe and the ramdisk at the end */
#define MEM_LAYOUT_ENV_SETTINGS \
"bootm_size=0x10000000\0" \
"kernel_addr_r=0x42000000\0" \
"fdt_addr_r=0x43000000\0" \
"scriptaddr=0x43100000\0" \
"pxefile_addr_r=0x43200000\0" \
"ramdisk_addr_r=0x43300000\0"
#ifdef CONFIG_AHCI #ifdef CONFIG_AHCI
#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0) #define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0)
#else #else
@ -233,7 +243,9 @@
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"bootm_size=0x10000000\0" \ MEM_LAYOUT_ENV_SETTINGS \
"fdtfile=" CONFIG_FTDFILE "\0" \
"console=ttyS0,115200\0" \
BOOTENV BOOTENV
#else /* ifndef CONFIG_SPL_BUILD */ #else /* ifndef CONFIG_SPL_BUILD */