diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2014-08-01 09:37:58 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2014-08-12 08:42:32 +0200 |
| commit | 846e325448ed591c4a5e8db55e2817b0ca013b0b (patch) | |
| tree | 7c0b45f7d1ea90f725fb09dee2e031fa50f1c2c6 /include | |
| parent | 2ec3a612f440364fa0ed250f22e7d3c3a8d72b92 (diff) | |
| download | u-boot-846e325448ed591c4a5e8db55e2817b0ca013b0b.zip u-boot-846e325448ed591c4a5e8db55e2817b0ca013b0b.tar.gz u-boot-846e325448ed591c4a5e8db55e2817b0ca013b0b.tar.bz2 | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/sunxi-common.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 9bfc4ee..e768921 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -100,10 +100,10 @@ /* Boot Argument Buffer Size */ #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 */ -#define CONFIG_STANDALONE_LOAD_ADDR 0x48000000 +#define CONFIG_STANDALONE_LOAD_ADDR 0x42000000 #define CONFIG_SYS_HZ 1000 @@ -217,6 +217,16 @@ #ifndef CONFIG_SPL_BUILD #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 #define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0) #else @@ -233,7 +243,9 @@ #include <config_distro_bootcmd.h> #define CONFIG_EXTRA_ENV_SETTINGS \ - "bootm_size=0x10000000\0" \ + MEM_LAYOUT_ENV_SETTINGS \ + "fdtfile=" CONFIG_FTDFILE "\0" \ + "console=ttyS0,115200\0" \ BOOTENV #else /* ifndef CONFIG_SPL_BUILD */ |