From: Dalon Westergreen dalon.westergreen@intel.com
These patches update the boot and os partition numbers in the default uboot environment for a number of socfpga boards. Per request, common environment configurations have been moved to a shared header.
Changes in v5: - Fixed sockit linux devicetree name - Changed default socfpga.dtb to match board name - sr1500 -> socfpga_cyclone5_sr1500.dtb - de1 -> socfpga_cyclone5_de1_soc.dtb Changes in v4: - Removed extraneous define in socfpga_common.h and only use CONFIG_EXTRA_ENV_SETTINGS for common uboot environment Changes in v3: - Corrected error in common default environment
Dalon Westergreen (7): arm: socfpga: add env settings to common header arm: socfpga: update de0 nano default environment arm: socfpga: update cyclone5 socdk default environment arm: socfpga: update arria5 socdk default environment arm: socfpga: Update DE1 environment arm: socfpga: Update SoCKit environment arm: socfpga: Update sr1500 environment
configs/socfpga_arria5_defconfig | 1 + configs/socfpga_cyclone5_defconfig | 1 + configs/socfpga_de0_nano_soc_defconfig | 3 +-- configs/socfpga_de1_soc_defconfig | 1 + configs/socfpga_sockit_defconfig | 1 + configs/socfpga_sr1500_defconfig | 1 + include/configs/socfpga_arria5_socdk.h | 25 ------------------------- include/configs/socfpga_common.h | 27 +++++++++++++++++++++++++++ include/configs/socfpga_cyclone5_socdk.h | 25 ------------------------- include/configs/socfpga_de0_nano_soc.h | 19 +------------------ include/configs/socfpga_de1_soc.h | 19 +------------------ include/configs/socfpga_sockit.h | 27 +-------------------------- include/configs/socfpga_sr1500.h | 25 ------------------------- 13 files changed, 36 insertions(+), 139 deletions(-)
From: Dalon Westergreen dalon.westergreen@intel.com
Move repeated environment settings for socfpga boards to a common header.
The default values for the boot partition and the OS filesystem partition have changed and as as result the default uboot environment for socfpga boards needs updating.
Move to using CONFIG_DEFAULT_DEVICE_TREE for setting the default linux devicetree used during linux boot.
Signed-off-by: Dalon Westergreen dalon.westergreen@intel.com Acked-by: Marek Vasut marex@denx.de --- include/configs/socfpga_common.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 6285266..bdd6e2f 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -336,5 +336,32 @@ unsigned int cm_get_qspi_controller_clk_hz(void); * Stack setup */ #define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR + +/* Extra Environment */ +#ifndef CONFIG_EXTRA_ENV_SETTINGS +#define CONFIG_EXTRA_ENV_SETTINGS \ + "verify=n\0" \ + "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "bootimage=" CONFIG_BOOTFILE "\0" \ + "fdt_addr=100\0" \ + "fdtimage=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ + "bootm ${loadaddr} - ${fdt_addr}\0" \ + "mmcroot=/dev/mmcblk0p3\0" \ + "mmcboot=setenv bootargs " CONFIG_BOOTARGS \ + " root=${mmcroot} rw rootwait;" \ + "bootz ${loadaddr} - ${fdt_addr}\0" \ + "mmcload=mmc rescan;" \ + "load mmc 0:2 ${loadaddr} ${bootimage};" \ + "load mmc 0:2 ${fdt_addr} ${fdtimage}\0" \ + "qspiload=sf probe && mtdparts default && run ubiload\0" \ + "qspiboot=setenv bootargs " CONFIG_BOOTARGS \ + " ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\ + "bootz ${loadaddr} - ${fdt_addr}\0" \ + "ubiload=ubi part UBI && ubifsmount ubi0 && " \ + "ubifsload ${loadaddr} /boot/${bootimage} && " \ + "ubifsload ${fdt_addr} /boot/${fdtimage}\0" + +#endif
#endif /* __CONFIG_SOCFPGA_COMMON_H__ */
From: Dalon Westergreen dalon.westergreen@intel.com
Remove the default environment as it is now in a common header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.
Signed-off-by: Dalon Westergreen dalon.westergreen@intel.com Acked-by: Marek Vasut marex@denx.de --- configs/socfpga_de0_nano_soc_defconfig | 3 +-- include/configs/socfpga_de0_nano_soc.h | 19 +------------------ 2 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig index af41e1e..4837809 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y CONFIG_SPL_STACK_R_ADDR=0x00800000 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc" +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de0_sockit.dtb" CONFIG_FIT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y @@ -20,7 +21,6 @@ CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y -CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y @@ -35,7 +35,6 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y -CONFIG_CMD_UBI=y CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DM_GPIO=y diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h index 6b9546e..97216ea 100644 --- a/include/configs/socfpga_de0_nano_soc.h +++ b/include/configs/socfpga_de0_nano_soc.h @@ -18,7 +18,7 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */
/* Booting Linux */ -#define CONFIG_BOOTFILE "fitImage" +#define CONFIG_BOOTFILE "zImage" #define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) #define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot" #define CONFIG_LOADADDR 0x01000000 @@ -32,23 +32,6 @@
#define CONFIG_ENV_IS_IN_MMC
-/* Extra Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ - "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ - "bootm ${loadaddr} - ${fdt_addr}\0" \ - "bootimage=zImage\0" \ - "fdt_addr=100\0" \ - "fdtimage=socfpga.dtb\0" \ - "bootm ${loadaddr} - ${fdt_addr}\0" \ - "mmcroot=/dev/mmcblk0p2\0" \ - "mmcboot=setenv bootargs " CONFIG_BOOTARGS \ - " root=${mmcroot} rw rootwait;" \ - "bootz ${loadaddr} - ${fdt_addr}\0" \ - "mmcload=mmc rescan;" \ - "load mmc 0:1 ${loadaddr} ${bootimage};" \ - "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \ - /* The rest of the configuration is shared */ #include <configs/socfpga_common.h>
From: Dalon Westergreen dalon.westergreen@intel.com
Remove the default environment as it is now in a common header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.
Signed-off-by: Dalon Westergreen dalon.westergreen@intel.com Acked-by: Marek Vasut marex@denx.de --- configs/socfpga_cyclone5_defconfig | 1 + include/configs/socfpga_cyclone5_socdk.h | 25 ------------------------- 2 files changed, 1 insertion(+), 25 deletions(-)
diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index 8b050b9..cba1e9c 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y CONFIG_SPL_STACK_R_ADDR=0x00800000 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk" +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_socdk.dtb" CONFIG_FIT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h index 7ced6a6..96b2b87 100644 --- a/include/configs/socfpga_cyclone5_socdk.h +++ b/include/configs/socfpga_cyclone5_socdk.h @@ -36,31 +36,6 @@
#define CONFIG_ENV_IS_IN_MMC
-/* Extra Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ - "verify=n\0" \ - "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ - "bootm ${loadaddr} - ${fdt_addr}\0" \ - "bootimage=zImage\0" \ - "fdt_addr=100\0" \ - "fdtimage=socfpga.dtb\0" \ - "bootm ${loadaddr} - ${fdt_addr}\0" \ - "mmcroot=/dev/mmcblk0p2\0" \ - "mmcboot=setenv bootargs " CONFIG_BOOTARGS \ - " root=${mmcroot} rw rootwait;" \ - "bootz ${loadaddr} - ${fdt_addr}\0" \ - "mmcload=mmc rescan;" \ - "load mmc 0:1 ${loadaddr} ${bootimage};" \ - "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \ - "qspiload=sf probe && mtdparts default && run ubiload\0" \ - "qspiboot=setenv bootargs " CONFIG_BOOTARGS \ - " ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\ - "bootz ${loadaddr} - ${fdt_addr}\0" \ - "ubiload=ubi part UBI && ubifsmount ubi0 && " \ - "ubifsload ${loadaddr} /boot/${bootimage} && " \ - "ubifsload ${fdt_addr} /boot/${fdtimage}\0" - /* The rest of the configuration is shared */ #include <configs/socfpga_common.h>
From: Dalon Westergreen dalon.westergreen@intel.com
Remove the default environment as it is now in a common header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.
Signed-off-by: Dalon Westergreen dalon.westergreen@intel.com Acked-by: Marek Vasut marex@denx.de --- configs/socfpga_arria5_defconfig | 1 + include/configs/socfpga_arria5_socdk.h | 25 ------------------------- 2 files changed, 1 insertion(+), 25 deletions(-)
diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index 43c51fe..6a473a9 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_SOCFPGA_ARRIA5_SOCDK=y CONFIG_SPL_STACK_R_ADDR=0x00800000 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk" +CONFIG_DEFAULT_FDT_FILE="socfpga_arria5_socdk.dtb" CONFIG_FIT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h index 3b0b416..481a032 100644 --- a/include/configs/socfpga_arria5_socdk.h +++ b/include/configs/socfpga_arria5_socdk.h @@ -36,31 +36,6 @@
#define CONFIG_ENV_IS_IN_MMC
-/* Extra Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ - "verify=n\0" \ - "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ - "bootm ${loadaddr} - ${fdt_addr}\0" \ - "bootimage=zImage\0" \ - "fdt_addr=100\0" \ - "fdtimage=socfpga.dtb\0" \ - "bootm ${loadaddr} - ${fdt_addr}\0" \ - "mmcroot=/dev/mmcblk0p2\0" \ - "mmcboot=setenv bootargs " CONFIG_BOOTARGS \ - " root=${mmcroot} rw rootwait;" \ - "bootz ${loadaddr} - ${fdt_addr}\0" \ - "mmcload=mmc rescan;" \ - "load mmc 0:1 ${loadaddr} ${bootimage};" \ - "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \ - "qspiload=sf probe && mtdparts default && run ubiload\0" \ - "qspiboot=setenv bootargs " CONFIG_BOOTARGS \ - " ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\ - "bootz ${loadaddr} - ${fdt_addr}\0" \ - "ubiload=ubi part UBI && ubifsmount ubi0 && " \ - "ubifsload ${loadaddr} /boot/${bootimage} && " \ - "ubifsload ${fdt_addr} /boot/${fdtimage}\0" - /* The rest of the configuration is shared */ #include <configs/socfpga_common.h>
From: Dalon Westergreen dalon.westergreen@intel.com
Remove the default environment as it is now in a common header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.
Signed-off-by: Dalon Westergreen dalon.westergreen@intel.com --- configs/socfpga_de1_soc_defconfig | 1 + include/configs/socfpga_de1_soc.h | 19 +------------------ 2 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/configs/socfpga_de1_soc_defconfig b/configs/socfpga_de1_soc_defconfig index 032deef..d78e8a1 100644 --- a/configs/socfpga_de1_soc_defconfig +++ b/configs/socfpga_de1_soc_defconfig @@ -6,6 +6,7 @@ CONFIG_TARGET_SOCFPGA_TERASIC_DE1_SOC=y CONFIG_SPL_STACK_R_ADDR=0x00800000 CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de1_soc" +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de1_soc.dtb" CONFIG_FIT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h index deec647..3142bd1 100644 --- a/include/configs/socfpga_de1_soc.h +++ b/include/configs/socfpga_de1_soc.h @@ -18,7 +18,7 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */
/* Booting Linux */ -#define CONFIG_BOOTFILE "fitImage" +#define CONFIG_BOOTFILE "zImage" #define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) #define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot" #define CONFIG_LOADADDR 0x01000000 @@ -32,23 +32,6 @@
#define CONFIG_ENV_IS_IN_MMC
-/* Extra Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ - "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ - "bootm ${loadaddr} - ${fdtaddr}\0" \ - "bootimage=zImage\0" \ - "fdtaddr=100\0" \ - "fdtimage=socfpga.dtb\0" \ - "bootm ${loadaddr} - ${fdtaddr}\0" \ - "mmcroot=/dev/mmcblk0p2\0" \ - "mmcboot=setenv bootargs " CONFIG_BOOTARGS \ - " root=${mmcroot} rw rootwait;" \ - "bootz ${loadaddr} - ${fdtaddr}\0" \ - "mmcload=mmc rescan;" \ - "load mmc 0:1 ${loadaddr} ${bootimage};" \ - "load mmc 0:1 ${fdtaddr} ${fdtimage}\0" \ - /* The rest of the configuration is shared */ #include <configs/socfpga_common.h>
From: Dalon Westergreen dalon.westergreen@intel.com
Remove the default environment as it is now in a common header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.
Signed-off-by: Dalon Westergreen dalon.westergreen@intel.com --- configs/socfpga_sockit_defconfig | 1 + include/configs/socfpga_sockit.h | 27 +-------------------------- 2 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig index d0c2bda..bf60783 100644 --- a/configs/socfpga_sockit_defconfig +++ b/configs/socfpga_sockit_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_SOCFPGA_TERASIC_SOCKIT=y CONFIG_SPL_STACK_R_ADDR=0x00800000 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit" +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_sockit.dtb" CONFIG_FIT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h index 3fceb31..c51cc72 100644 --- a/include/configs/socfpga_sockit.h +++ b/include/configs/socfpga_sockit.h @@ -18,7 +18,7 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCDK */
/* Booting Linux */ -#define CONFIG_BOOTFILE "fitImage" +#define CONFIG_BOOTFILE "zImage" #define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) #define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot" #define CONFIG_LOADADDR 0x01000000 @@ -32,31 +32,6 @@
#define CONFIG_ENV_IS_IN_MMC
-/* Extra Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ - "verify=n\0" \ - "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ - "bootm ${loadaddr} - ${fdt_addr}\0" \ - "bootimage=zImage\0" \ - "fdt_addr=100\0" \ - "fdtimage=socfpga.dtb\0" \ - "bootm ${loadaddr} - ${fdt_addr}\0" \ - "mmcroot=/dev/mmcblk0p2\0" \ - "mmcboot=setenv bootargs " CONFIG_BOOTARGS \ - " root=${mmcroot} rw rootwait;" \ - "bootz ${loadaddr} - ${fdt_addr}\0" \ - "mmcload=mmc rescan;" \ - "load mmc 0:1 ${loadaddr} ${bootimage};" \ - "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \ - "qspiload=sf probe && mtdparts default && run ubiload\0" \ - "qspiboot=setenv bootargs " CONFIG_BOOTARGS \ - " ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\ - "bootz ${loadaddr} - ${fdt_addr}\0" \ - "ubiload=ubi part UBI && ubifsmount ubi0 && " \ - "ubifsload ${loadaddr} /boot/${bootimage} && " \ - "ubifsload ${fdt_addr} /boot/${fdtimage}\0" - /* The rest of the configuration is shared */ #include <configs/socfpga_common.h>
From: Dalon Westergreen dalon.westergreen@intel.com
Remove the default environment as it is now in a common header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.
Signed-off-by: Dalon Westergreen dalon.westergreen@intel.com --- configs/socfpga_sr1500_defconfig | 1 + include/configs/socfpga_sr1500.h | 25 ------------------------- 2 files changed, 1 insertion(+), 25 deletions(-)
diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig index 6fd7bc0..4c63b02 100644 --- a/configs/socfpga_sr1500_defconfig +++ b/configs/socfpga_sr1500_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_SOCFPGA_SR1500=y CONFIG_SPL_STACK_R_ADDR=0x00800000 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500" +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_sr1500.dtb" CONFIG_FIT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index 0407f03..3c63e80 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -32,31 +32,6 @@ #define CONFIG_PHY_MARVELL #define PHY_ANEG_TIMEOUT 8000
-#define CONFIG_EXTRA_ENV_SETTINGS \ - "verify=n\0" \ - "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ - "bootm ${loadaddr} - ${fdt_addr}\0" \ - "bootimage=zImage\0" \ - "fdt_addr=100\0" \ - "fdtimage=socfpga.dtb\0" \ - "fsloadcmd=ext2load\0" \ - "bootm ${loadaddr} - ${fdt_addr}\0" \ - "mmcroot=/dev/mmcblk0p2\0" \ - "mmcboot=setenv bootargs " CONFIG_BOOTARGS \ - " root=${mmcroot} rw rootwait;" \ - "bootz ${loadaddr} - ${fdt_addr}\0" \ - "mmcload=mmc rescan;" \ - "load mmc 0:1 ${loadaddr} ${bootimage};" \ - "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \ - "qspiload=sf probe && mtdparts default && run ubiload\0" \ - "qspiboot=setenv bootargs " CONFIG_BOOTARGS \ - " ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\ - "bootz ${loadaddr} - ${fdt_addr}\0" \ - "ubiload=ubi part UBI && ubifsmount ubi0 && " \ - "ubifsload ${loadaddr} /boot/${bootimage} && " \ - "ubifsload ${fdt_addr} /boot/${fdtimage}\0" - /* Environment */ #define CONFIG_ENV_IS_IN_SPI_FLASH
On 01/25/2017 05:13 AM, Dalon Westergreen wrote:
From: Dalon Westergreen dalon.westergreen@intel.com
These patches update the boot and os partition numbers in the default uboot environment for a number of socfpga boards. Per request, common environment configurations have been moved to a shared header.
OK, waiting for Acks from Dinh, just to be sure.
btw a nit, please fill the $subject of cover letter next time.
Changes in v5:
- Fixed sockit linux devicetree name
- Changed default socfpga.dtb to match board name - sr1500 -> socfpga_cyclone5_sr1500.dtb - de1 -> socfpga_cyclone5_de1_soc.dtb
Changes in v4:
- Removed extraneous define in socfpga_common.h and only use CONFIG_EXTRA_ENV_SETTINGS for common uboot environment
Changes in v3:
- Corrected error in common default environment
Dalon Westergreen (7): arm: socfpga: add env settings to common header arm: socfpga: update de0 nano default environment arm: socfpga: update cyclone5 socdk default environment arm: socfpga: update arria5 socdk default environment arm: socfpga: Update DE1 environment arm: socfpga: Update SoCKit environment arm: socfpga: Update sr1500 environment
configs/socfpga_arria5_defconfig | 1 + configs/socfpga_cyclone5_defconfig | 1 + configs/socfpga_de0_nano_soc_defconfig | 3 +-- configs/socfpga_de1_soc_defconfig | 1 + configs/socfpga_sockit_defconfig | 1 + configs/socfpga_sr1500_defconfig | 1 + include/configs/socfpga_arria5_socdk.h | 25 ------------------------- include/configs/socfpga_common.h | 27 +++++++++++++++++++++++++++ include/configs/socfpga_cyclone5_socdk.h | 25 ------------------------- include/configs/socfpga_de0_nano_soc.h | 19 +------------------ include/configs/socfpga_de1_soc.h | 19 +------------------ include/configs/socfpga_sockit.h | 27 +-------------------------- include/configs/socfpga_sr1500.h | 25 ------------------------- 13 files changed, 36 insertions(+), 139 deletions(-)
On 01/25/2017 03:48 AM, Marek Vasut wrote:
On 01/25/2017 05:13 AM, Dalon Westergreen wrote:
From: Dalon Westergreen dalon.westergreen@intel.com
These patches update the boot and os partition numbers in the default uboot environment for a number of socfpga boards. Per request, common environment configurations have been moved to a shared header.
OK, waiting for Acks from Dinh, just to be sure.
btw a nit, please fill the $subject of cover letter next time.
For the whole series:
Acked-by: Dinh Nguyen dinguyen@kernel.org
Thanks...
On Wed, 2017-01-25 at 08:39 -0600, Dinh Nguyen wrote:
On 01/25/2017 03:48 AM, Marek Vasut wrote:
On 01/25/2017 05:13 AM, Dalon Westergreen wrote:
From: Dalon Westergreen dalon.westergreen@intel.com
These patches update the boot and os partition numbers in the default uboot environment for a number of socfpga boards. Per request, common environment configurations have been moved to a shared header.
OK, waiting for Acks from Dinh, just to be sure.
btw a nit, please fill the $subject of cover letter next time.
I was just informed of an issue with moving the fat/boot partition to p2. Windows no longer mounts the fat partition. I'm not sure who or why CONFIG_SYS_MMCSD_FS_BOOT_PARTITION was changed to 2 but i think in order to allow windows to mount the fat partition it will need to be the first partition. So i am going to change CONFIG_SYS_MMCSD_FS_BOOT_PARTITION back to 1, and change the default env variables appropriately.
For the whole series:
Acked-by: Dinh Nguyen dinguyen@kernel.org
Thanks...
On 01/25/2017 06:33 PM, Dalon Westergreen wrote:
On Wed, 2017-01-25 at 08:39 -0600, Dinh Nguyen wrote:
On 01/25/2017 03:48 AM, Marek Vasut wrote:
On 01/25/2017 05:13 AM, Dalon Westergreen wrote:
From: Dalon Westergreen dalon.westergreen@intel.com
These patches update the boot and os partition numbers in the default uboot environment for a number of socfpga boards. Per request, common environment configurations have been moved to a shared header.
OK, waiting for Acks from Dinh, just to be sure.
btw a nit, please fill the $subject of cover letter next time.
I was just informed of an issue with moving the fat/boot partition to p2. Windows no longer mounts the fat partition. I'm not sure who or why CONFIG_SYS_MMCSD_FS_BOOT_PARTITION was changed to 2 but i think in order to allow windows to mount the fat partition it will need to be the first partition. So i am going to change CONFIG_SYS_MMCSD_FS_BOOT_PARTITION back to 1, and change the default env variables appropriately.
You mean the layout is now: - p1 0x83 - p2 0xa2 - ...
I think this is really flaky, but I heard somewhere on the list that it is possible to write the u-boot-spl-with-dtb.sfp (without having actual 0xa2 partition) to offset 64 kiB and the machine will still boot. I am starting to consider using this approach as it will also allow distro bootcmd to work and distros to integrate altera boards.
Am 25.01.2017 um 21:21 schrieb Marek Vasut:
On 01/25/2017 06:33 PM, Dalon Westergreen wrote:
On Wed, 2017-01-25 at 08:39 -0600, Dinh Nguyen wrote:
On 01/25/2017 03:48 AM, Marek Vasut wrote:
On 01/25/2017 05:13 AM, Dalon Westergreen wrote:
From: Dalon Westergreen dalon.westergreen@intel.com
These patches update the boot and os partition numbers in the default uboot environment for a number of socfpga boards. Per request, common environment configurations have been moved to a shared header.
OK, waiting for Acks from Dinh, just to be sure.
btw a nit, please fill the $subject of cover letter next time.
I was just informed of an issue with moving the fat/boot partition to p2. Windows no longer mounts the fat partition. I'm not sure who or why CONFIG_SYS_MMCSD_FS_BOOT_PARTITION was changed to 2 but i think in order to allow windows to mount the fat partition it will need to be the first partition. So i am going to change CONFIG_SYS_MMCSD_FS_BOOT_PARTITION back to 1, and change the default env variables appropriately.
You mean the layout is now:
- p1 0x83
- p2 0xa2
- ...
I think this is really flaky, but I heard somewhere on the list that it is possible to write the u-boot-spl-with-dtb.sfp (without having actual 0xa2 partition) to offset 64 kiB and the machine will still boot. I am starting to consider using this approach as it will also allow distro bootcmd to work and distros to integrate altera boards.
Yes, when
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
is set then the SPL will search for an u-boot image at the CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR location on the MMC after a failed scan for a 0xa2 partition. So with that option the uboot image can be installed on the MMC by
dd if=u-boot-with-spl.sfp of=<disk> bs=64k seek=1 skip=1
With that the first 64KiB of the MMC are untouched, MBR/GPT for the OS is preserved, and u-boot can start without 0xa2 partition.
Br, Frank
On Wed, 2017-01-25 at 22:52 +0100, Frank Kunz wrote:
Am 25.01.2017 um 21:21 schrieb Marek Vasut:
On 01/25/2017 06:33 PM, Dalon Westergreen wrote:
On Wed, 2017-01-25 at 08:39 -0600, Dinh Nguyen wrote:
On 01/25/2017 03:48 AM, Marek Vasut wrote:
On 01/25/2017 05:13 AM, Dalon Westergreen wrote:
From: Dalon Westergreen dalon.westergreen@intel.com
These patches update the boot and os partition numbers in the default uboot environment for a number of socfpga boards. Per request, common environment configurations have been moved to a shared header.
OK, waiting for Acks from Dinh, just to be sure.
btw a nit, please fill the $subject of cover letter next time.
I was just informed of an issue with moving the fat/boot partition to p2. Windows no longer mounts the fat partition. I'm not sure who or why CONFIG_SYS_MMCSD_FS_BOOT_PARTITION was changed to 2 but i think in order to allow windows to mount the fat partition it will need to be the first partition. So i am going to change CONFIG_SYS_MMCSD_FS_BOOT_PARTITION back to 1, and change the default env variables appropriately.
You mean the layout is now:
- p1 0x83
- p2 0xa2
- ...
I think this is really flaky, but I heard somewhere on the list that it is possible to write the u-boot-spl-with-dtb.sfp (without having actual 0xa2 partition) to offset 64 kiB and the machine will still boot. I am starting to consider using this approach as it will also allow distro bootcmd to work and distros to integrate altera boards.
Yes, when
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
is set then the SPL will search for an u-boot image at the CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR location on the MMC after a failed scan for a 0xa2 partition. So with that option the uboot image can be installed on the MMC by
dd if=u-boot-with-spl.sfp of=<disk> bs=64k seek=1 skip=1
With that the first 64KiB of the MMC are untouched, MBR/GPT for the OS is preserved, and u-boot can start without 0xa2 partition.
I see, and i understand why this works. I am not sure i can suggest this as a normal option. The mechanism i believe that allows this is a fail over in the bootrom code. As i understand it, if no A2 partition is found the bootrom tries 0x0. the spl image is replicated 4 times by default, because the bootrom allows for four failures. if the first image fails for any reason (watchdog timeout, incorrect header, crc failure), the next image, starting at 64KB is tried. So my belief is the bootrom code is failing to boot the first time and is trying the "second" 64KB offset as a second attempt which is where your setup above is placing it's first image.
That said, my suggestion is still using the a2 partition. Thoughts?
--dalon
Br, Frank
U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
participants (4)
-
Dalon Westergreen -
Dinh Nguyen -
Frank Kunz -
Marek Vasut