[U-Boot] [PATCH 0/3] STiH410-B2260: update environment/configuration settings
From: Patrice Chotard patrice.chotard@st.com
Update the CONFIG_EXTRA_ENV_SETTINGS, BOOT_TARGET_DEVICES and CONFIG_BOOTARGS Fix SDRAM size
This series depends on series "[PATCH v3 00/13] STiH410-B2260: add reset, usb and fastboot support" [1]. Hence this series must be applied when [1] will be merged.
[1] http://u-boot.10912.n7.nabble.com/PATCH-v3-00-13-STiH410-B2260-add-reset-usb...
Lee Jones (1): board: STiH410-B2260: set ramdisk_addr_r to 0x48000000
Nicolas Le Bayon (1): board: STiH410-B2260: fix sdram size
Patrice Chotard (1): board: STiH410-B2260: update environment variable
include/configs/stih410-b2260.h | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-)
From: Patrice Chotard patrice.chotard@st.com
Signed-off-by: Patrice Chotard patrice.chotard@st.com --- include/configs/stih410-b2260.h | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-)
diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index 6c84e9b..7fcb327 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -20,13 +20,32 @@
#define CONFIG_SYS_HZ_CLOCK 1000000000 /* 1 GHz */
-#define CONFIG_BOOTARGS \ - "console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" - +#include <config_distro_defaults.h> /* Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ - "board= B2260" \ - "load_addr= #CONFIG_SYS_LOAD_ADDR \0" + +/* we assume that rootfs is located on second partition formatted in ext4 */ +#define CONFIG_BOOTARGS \ + "console=ttyAS1,115200 CONSOLE=/dev/ttyAS1 consoleblank=0 root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait mem=992M@0x40000000 vmalloc=256m" + +#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR + +#define CONFIG_ENV_VARS_UBOOT_CONFIG + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(USB, usb, 0) \ + func(DHCP, dhcp, na) +#include <config_distro_bootcmd.h> +#define CONFIG_BOOTFILE "uImage" +#define CONFIG_EXTRA_ENV_SETTINGS \ + "kernel_addr_r=0x40000000\0" \ + "fdtfile=stih410-b2260.dtb\0" \ + "fdt_addr_r=0x47000000\0" \ + "scriptaddr=0x50000000\0" \ + "fdt_high=0xffffffffffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" \ + BOOTENV +
#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x4000
From: Nicolas Le Bayon nicolas.le.bayon@st.com
32MB are reserved for Trusted Zone purpose
Signed-off-by: Nicolas Le Bayon nicolas.le.bayon@st.com --- include/configs/stih410-b2260.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index 7fcb327..ccbbf32 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -14,7 +14,7 @@ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 0x40000000 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 -#define PHYS_SDRAM_1_SIZE 0x3FE00000 +#define PHYS_SDRAM_1_SIZE 0x3E000000 #define CONFIG_SYS_TEXT_BASE 0x7D600000 #define CONFIG_SYS_LOAD_ADDR PHYS_SDRAM_1 /* default load addr */
From: Lee Jones lee.jones@linaro.org
Signed-off-by: Lee Jones lee.jones@linaro.org --- include/configs/stih410-b2260.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index ccbbf32..b83bef5 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -44,6 +44,7 @@ "scriptaddr=0x50000000\0" \ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \ + "ramdisk_addr_r=0x48000000\0" \ BOOTENV
participants (1)
-
patrice.chotard＠st.com