[U-Boot] [PATCH v7 0/7] arm: socfpga: update default u-boot environment
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.
Changed in v7: Changed the bootloader partition to 3 to match the default layout for socfpga. commit 61520ac4d5545cc8d2e1792092e46ab8043d5f36 changed this to 1 which broke a number of socfpga kits. The default sdcard layour places partition 3 at the start of the fpga at +1MB. The partition is of type 0xA2. This is followed by partition 1 (FAT), and partition 2 (RootFS). Partition 1 should be the FAT partition or windows appears not to recognize the sdcard. Changed in v6: Changed CONFIG_SYS_MMCSD_FS_BOOT_PARTITION to be 1 for SPL_FAT and 2 for SPL_EXT support. I believe this is the original intent for whomever changed CONFIG_SYS_MMCSD_FS_BOOT_PARTITION to be 2. This allows us to keep the original sdcard layout and support FAT and EXT loading of the u-boot image 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 | 35 ++++++++++++++++++++++++++++++-- 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, 42 insertions(+), 141 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 --- include/configs/socfpga_common.h | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-)
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 6285266..744aee9 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -312,10 +312,14 @@ unsigned int cm_get_qspi_controller_clk_hz(void); /* SPL SDMMC boot support */ #ifdef CONFIG_SPL_MMC_SUPPORT #if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT) -#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 2 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" +#ifdef CONFIG_SPL_FAT_SUPPORT +#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 +#else +#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 2 +#endif #else -#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION 1 +#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION 3 #endif #endif
@@ -336,5 +340,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/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" + +#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 Acked-by: Dinh Nguyen dinguyen@kernel.org --- 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 Acked-by: Dinh Nguyen dinguyen@kernel.org --- 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 Acked-by: Marek Vasut marex@denx.de Acked-by: Dinh Nguyen dinguyen@kernel.org --- 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 Acked-by: Marek Vasut marex@denx.de Acked-by: Dinh Nguyen dinguyen@kernel.org --- 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 Acked-by: Marek Vasut marex@denx.de Acked-by: Dinh Nguyen dinguyen@kernel.org --- 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/26/2017 09:31 PM, 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.
Changed in v7: Changed the bootloader partition to 3 to match the default layout for socfpga. commit 61520ac4d5545cc8d2e1792092e46ab8043d5f36 changed this to 1 which broke a number of socfpga kits.
And this commit will break another bulk of kits, great ...
The default sdcard layour places partition 3 at the start of the fpga at +1MB. The partition is of type 0xA2. This is followed by partition 1 (FAT), and partition 2 (RootFS). Partition 1 should be the FAT partition or windows appears not to recognize the sdcard.
Isn't this fixing problems at the wrong place ? Maybe Microsoft should fix their OS instead ...
Changed in v6: Changed CONFIG_SYS_MMCSD_FS_BOOT_PARTITION to be 1 for SPL_FAT and 2 for SPL_EXT support. I believe this is the original intent for whomever changed CONFIG_SYS_MMCSD_FS_BOOT_PARTITION to be 2. This allows us to keep the original sdcard layout and support FAT and EXT loading of the u-boot image 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 | 35 ++++++++++++++++++++++++++++++-- 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, 42 insertions(+), 141 deletions(-)
On Thu, 2017-01-26 at 21:54 +0100, Marek Vasut wrote:
On 01/26/2017 09:31 PM, 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.
Changed in v7: Changed the bootloader partition to 3 to match the default layout for socfpga. commit 61520ac4d5545cc8d2e1792092e46ab8043d5f36 changed this to 1 which broke a number of socfpga kits.
And this commit will break another bulk of kits, great ...
I think the only kit that MAY be affected is the DE1 kit and I actually dont even think that is true b/c they are probably using the method described in the former thread where they just write the u-boot-with-spl.sfp to +64KB. CONFIG_SPL_ABORT_ON_RAW_IMAGE is defined for the board. If i had a board I would test it. But that said, this is currently how all of the altera kits, and the de0 kit work.
The default sdcard layour places partition 3 at the start of the fpga at +1MB. The partition is of type 0xA2. This is followed by partition 1 (FAT), and partition 2 (RootFS). Partition 1 should be the FAT partition or windows appears not to recognize the sdcard.
Isn't this fixing problems at the wrong place ? Maybe Microsoft should fix their OS instead ...
Agreed, but i have no control of that, and am certainly not a user....
I would love to know how best to proceed, i can tell you the 2017.01 tag does not boot my altera boards.
--dalon
Changed in v6: Changed CONFIG_SYS_MMCSD_FS_BOOT_PARTITION to be 1 for SPL_FAT and 2 for SPL_EXT support. I believe this is the original intent for whomever changed CONFIG_SYS_MMCSD_FS_BOOT_PARTITION to be 2. This allows us to keep the original sdcard layout and support FAT and EXT loading of the u-boot image 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 | 35 ++++++++++++++++++++++++++++++-- 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, 42 insertions(+), 141 deletions(-)
On 01/26/2017 10:05 PM, Dalon Westergreen wrote:
On Thu, 2017-01-26 at 21:54 +0100, Marek Vasut wrote:
On 01/26/2017 09:31 PM, 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.
Changed in v7: Changed the bootloader partition to 3 to match the default layout for socfpga. commit 61520ac4d5545cc8d2e1792092e46ab8043d5f36 changed this to 1 which broke a number of socfpga kits.
And this commit will break another bulk of kits, great ...
I think the only kit that MAY be affected is the DE1 kit and I actually dont even think that is true b/c they are probably using the method described in the former thread where they just write the u-boot-with-spl.sfp to +64KB. CONFIG_SPL_ABORT_ON_RAW_IMAGE is defined for the board.
And all the kits which used the environment in mainline U-Boot.
If i had a board I would test it. But that said, this is currently how all of the altera kits, and the de0 kit work.
I'd be happy to take the previous patchset without this new "windows compatibility"/"ancient u-boot compatibility" crap and then proceed with a discussion on this new topic.
But now that it came up, well, I guess I'll wait for Dinh to make the decision, since we clearly have totally different opinions.
On Thu, 2017-01-26 at 22:41 +0100, Marek Vasut wrote:
On 01/26/2017 10:05 PM, Dalon Westergreen wrote:
On Thu, 2017-01-26 at 21:54 +0100, Marek Vasut wrote:
On 01/26/2017 09:31 PM, 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.
Changed in v7: Changed the bootloader partition to 3 to match the default layout for socfpga. commit 61520ac4d5545cc8d2e1792092e46ab8043d5f36 changed this to 1 which broke a number of socfpga kits.
And this commit will break another bulk of kits, great ...
I think the only kit that MAY be affected is the DE1 kit and I actually dont even think that is true b/c they are probably using the method described in the former thread where they just write the u-boot-with-spl.sfp to +64KB. CONFIG_SPL_ABORT_ON_RAW_IMAGE is defined for the board.
And all the kits which used the environment in mainline U-Boot.
If i had a board I would test it. But that said, this is currently how all of the altera kits, and the de0 kit work.
I'd be happy to take the previous patchset without this new "windows compatibility"/"ancient u-boot compatibility" crap and then proceed with a discussion on this new topic.
But now that it came up, well, I guess I'll wait for Dinh to make the decision, since we clearly have totally different opinions.
Thanks. I am open to any suggestions, i could just wrap the boot partition number in socfpga_common with an ifndef? and define it as partition 3 in the altera boards which currently use that setup?
another option would be to re-implement the method used in the older 2013.01.01 uboot used by socfpga which, rather than using a partition number specifically looked for a partition of type 0xa2 making the partition number irrelevant?
--dalon
On 01/26/2017 11:33 PM, Dalon Westergreen wrote:
On Thu, 2017-01-26 at 22:41 +0100, Marek Vasut wrote:
On 01/26/2017 10:05 PM, Dalon Westergreen wrote:
On Thu, 2017-01-26 at 21:54 +0100, Marek Vasut wrote:
On 01/26/2017 09:31 PM, 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.
Changed in v7: Changed the bootloader partition to 3 to match the default layout for socfpga. commit 61520ac4d5545cc8d2e1792092e46ab8043d5f36 changed this to 1 which broke a number of socfpga kits.
And this commit will break another bulk of kits, great ...
I think the only kit that MAY be affected is the DE1 kit and I actually dont even think that is true b/c they are probably using the method described in the former thread where they just write the u-boot-with-spl.sfp to +64KB. CONFIG_SPL_ABORT_ON_RAW_IMAGE is defined for the board.
And all the kits which used the environment in mainline U-Boot.
If i had a board I would test it. But that said, this is currently how all of the altera kits, and the de0 kit work.
I'd be happy to take the previous patchset without this new "windows compatibility"/"ancient u-boot compatibility" crap and then proceed with a discussion on this new topic.
But now that it came up, well, I guess I'll wait for Dinh to make the decision, since we clearly have totally different opinions.
Thanks. I am open to any suggestions, i could just wrap the boot partition number in socfpga_common with an ifndef? and define it as partition 3 in the altera boards which currently use that setup?
Uh no, let's not add more ifdefs.
another option would be to re-implement the method used in the older 2013.01.01 uboot used by socfpga which, rather than using a partition number specifically looked for a partition of type 0xa2 making the partition number irrelevant?
Either that or load u-boot.img from FS (even better). Do you have an example patch for the first approach ? How intrusive is it ?
On Fri, 2017-01-27 at 03:11 +0100, Marek Vasut wrote:
On 01/26/2017 11:33 PM, Dalon Westergreen wrote:
On Thu, 2017-01-26 at 22:41 +0100, Marek Vasut wrote:
On 01/26/2017 10:05 PM, Dalon Westergreen wrote:
On Thu, 2017-01-26 at 21:54 +0100, Marek Vasut wrote:
On 01/26/2017 09:31 PM, 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.
Changed in v7: Changed the bootloader partition to 3 to match the default layout for socfpga. commit 61520ac4d5545cc8d2e1792092e46ab8043d5f36 changed this to 1 which broke a number of socfpga kits.
And this commit will break another bulk of kits, great ...
I think the only kit that MAY be affected is the DE1 kit and I actually dont even think that is true b/c they are probably using the method described in the former thread where they just write the u-boot-with-spl.sfp to +64KB. CONFIG_SPL_ABORT_ON_RAW_IMAGE is defined for the board.
And all the kits which used the environment in mainline U-Boot.
If i had a board I would test it. But that said, this is currently how all of the altera kits, and the de0 kit work.
I'd be happy to take the previous patchset without this new "windows compatibility"/"ancient u-boot compatibility" crap and then proceed with a discussion on this new topic.
But now that it came up, well, I guess I'll wait for Dinh to make the decision, since we clearly have totally different opinions.
Thanks. I am open to any suggestions, i could just wrap the boot partition number in socfpga_common with an ifndef? and define it as partition 3 in the altera boards which currently use that setup?
Uh no, let's not add more ifdefs.
another option would be to re-implement the method used in the older 2013.01.01 uboot used by socfpga which, rather than using a partition number specifically looked for a partition of type 0xa2 making the partition number irrelevant?
Either that or load u-boot.img from FS (even better). Do you have an example patch for the first approach ? How intrusive is it ?
I am working on it as we speak. I like that approach, i am thinking searching for the a2 partition is a failover in spl_mmc_load_image after mmc_load_image_raw_sector. i can test it, and send a patch for you to decide if it is too invasive?
On 01/27/2017 03:30 AM, Dalon Westergreen wrote:
On Fri, 2017-01-27 at 03:11 +0100, Marek Vasut wrote:
On 01/26/2017 11:33 PM, Dalon Westergreen wrote:
On Thu, 2017-01-26 at 22:41 +0100, Marek Vasut wrote:
On 01/26/2017 10:05 PM, Dalon Westergreen wrote:
On Thu, 2017-01-26 at 21:54 +0100, Marek Vasut wrote:
On 01/26/2017 09:31 PM, 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. > > > > Changed in v7: > Changed the bootloader partition to 3 to match the default layout > for > socfpga. commit 61520ac4d5545cc8d2e1792092e46ab8043d5f36 changed > this > to > 1 > which broke a number of socfpga kits.
And this commit will break another bulk of kits, great ...
I think the only kit that MAY be affected is the DE1 kit and I actually dont even think that is true b/c they are probably using the method described in the former thread where they just write the u-boot-with-spl.sfp to +64KB. CONFIG_SPL_ABORT_ON_RAW_IMAGE is defined for the board.
And all the kits which used the environment in mainline U-Boot.
If i had a board I would test it. But that said, this is currently how all of the altera kits, and the de0 kit work.
I'd be happy to take the previous patchset without this new "windows compatibility"/"ancient u-boot compatibility" crap and then proceed with a discussion on this new topic.
But now that it came up, well, I guess I'll wait for Dinh to make the decision, since we clearly have totally different opinions.
Thanks. I am open to any suggestions, i could just wrap the boot partition number in socfpga_common with an ifndef? and define it as partition 3 in the altera boards which currently use that setup?
Uh no, let's not add more ifdefs.
another option would be to re-implement the method used in the older 2013.01.01 uboot used by socfpga which, rather than using a partition number specifically looked for a partition of type 0xa2 making the partition number irrelevant?
Either that or load u-boot.img from FS (even better). Do you have an example patch for the first approach ? How intrusive is it ?
I am working on it as we speak. I like that approach, i am thinking searching for the a2 partition is a failover in spl_mmc_load_image after mmc_load_image_raw_sector. i can test it, and send a patch for you to decide if it is too invasive?
OK, thanks
participants (2)
-
Dalon Westergreen -
Marek Vasut