diff options
Diffstat (limited to 'package/boot/uboot-socfpga/patches')
2 files changed, 166 insertions, 0 deletions
diff --git a/package/boot/uboot-socfpga/patches/0001-arm-socfpga-Drop-space-after-loadaddr-in-extra-env.patch b/package/boot/uboot-socfpga/patches/0001-arm-socfpga-Drop-space-after-loadaddr-in-extra-env.patch new file mode 100644 index 0000000000..261afef827 --- /dev/null +++ b/package/boot/uboot-socfpga/patches/0001-arm-socfpga-Drop-space-after-loadaddr-in-extra-env.patch @@ -0,0 +1,101 @@ +From 04a4c90fee75c95130af1e40880c0927d56b0b61 Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Sun, 3 Apr 2016 19:11:12 +0200 +Subject: [PATCH 1/2] arm: socfpga: Drop space after 'loadaddr=' in extra env + +There is an incorrect space after loadaddr= in the extra environment, +so drop it. + +Signed-off-by: Marek Vasut <marex@denx.de> +Cc: Dinh Nguyen <dinguyen@opensource.altera.com> +Cc: Chin Liang See <clsee@altera.com> +--- + include/configs/socfpga_arria5_socdk.h | 2 +- + include/configs/socfpga_cyclone5_socdk.h | 2 +- + include/configs/socfpga_de0_nano_soc.h | 2 +- + include/configs/socfpga_sockit.h | 2 +- + include/configs/socfpga_socrates.h | 2 +- + include/configs/socfpga_sr1500.h | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h +index a0161bc..153f9f8 100644 +--- a/include/configs/socfpga_arria5_socdk.h ++++ b/include/configs/socfpga_arria5_socdk.h +@@ -56,7 +56,7 @@ + /* Extra Environment */ + #define CONFIG_EXTRA_ENV_SETTINGS \ + "verify=n\0" \ +- "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ ++ "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ + "bootm ${loadaddr} - ${fdt_addr}\0" \ + "bootimage=zImage\0" \ +diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h +index c4c4ecb..d7c339e 100644 +--- a/include/configs/socfpga_cyclone5_socdk.h ++++ b/include/configs/socfpga_cyclone5_socdk.h +@@ -56,7 +56,7 @@ + /* Extra Environment */ + #define CONFIG_EXTRA_ENV_SETTINGS \ + "verify=n\0" \ +- "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ ++ "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ + "bootm ${loadaddr} - ${fdt_addr}\0" \ + "bootimage=zImage\0" \ +diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h +index cbc7396..314b9bf 100644 +--- a/include/configs/socfpga_de0_nano_soc.h ++++ b/include/configs/socfpga_de0_nano_soc.h +@@ -51,7 +51,7 @@ + + /* Extra Environment */ + #define CONFIG_EXTRA_ENV_SETTINGS \ +- "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ ++ "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ + "bootm ${loadaddr} - ${fdt_addr}\0" \ + "bootimage=zImage\0" \ +diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h +index 95e7ba6..07cfcbf 100644 +--- a/include/configs/socfpga_sockit.h ++++ b/include/configs/socfpga_sockit.h +@@ -52,7 +52,7 @@ + /* Extra Environment */ + #define CONFIG_EXTRA_ENV_SETTINGS \ + "verify=n\0" \ +- "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ ++ "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ + "bootm ${loadaddr} - ${fdt_addr}\0" \ + "bootimage=zImage\0" \ +diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h +index c32a40a..02ea0c5 100644 +--- a/include/configs/socfpga_socrates.h ++++ b/include/configs/socfpga_socrates.h +@@ -52,7 +52,7 @@ + /* Extra Environment */ + #define CONFIG_EXTRA_ENV_SETTINGS \ + "verify=n\0" \ +- "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ ++ "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ + "bootm ${loadaddr} - ${fdt_addr}\0" \ + "bootimage=zImage\0" \ +diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h +index 6414eeb..e43b5cf 100644 +--- a/include/configs/socfpga_sr1500.h ++++ b/include/configs/socfpga_sr1500.h +@@ -55,7 +55,7 @@ + + #define CONFIG_EXTRA_ENV_SETTINGS \ + "verify=n\0" \ +- "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ ++ "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ + "bootm ${loadaddr} - ${fdt_addr}\0" \ + "bootimage=zImage\0" \ +-- +2.8.0.rc3 + diff --git a/package/boot/uboot-socfpga/patches/0002-arm-socfpga-Tweak-SoCkit-default-env-for-OpenWRT.patch b/package/boot/uboot-socfpga/patches/0002-arm-socfpga-Tweak-SoCkit-default-env-for-OpenWRT.patch new file mode 100644 index 0000000000..64ffea25b6 --- /dev/null +++ b/package/boot/uboot-socfpga/patches/0002-arm-socfpga-Tweak-SoCkit-default-env-for-OpenWRT.patch @@ -0,0 +1,65 @@ +From 3a0e4875b00e9e487b0081116a81ed17cfd5143f Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Sun, 3 Apr 2016 19:27:23 +0200 +Subject: [PATCH 2/2] arm: socfpga: Tweak SoCkit default env for OpenWRT + +Tweak the default environment on SoCFPGA SoCkit to match OpenWRT. +This means switching to fitImage, which is already available, but +not used by the environment and weeding out completely dysfunctional +pieces of the environment. + +Signed-off-by: Marek Vasut <marex@denx.de> +--- + include/configs/socfpga_sockit.h | 20 ++++++-------------- + 1 file changed, 6 insertions(+), 14 deletions(-) + +diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h +index 07cfcbf..5a90105 100644 +--- a/include/configs/socfpga_sockit.h ++++ b/include/configs/socfpga_sockit.h +@@ -35,7 +35,7 @@ + + /* Booting Linux */ + #define CONFIG_BOOTDELAY 3 +-#define CONFIG_BOOTFILE "fitImage" ++#define CONFIG_BOOTFILE "openwrt-socfpga-socfpga_cyclone5_sockit-fit-uImage.itb" + #define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) + #define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot" + #define CONFIG_LOADADDR 0x01000000 +@@ -51,28 +51,20 @@ + + /* 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" \ ++ "bootm ${loadaddr}\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" \ ++ "bootm ${loadaddr}\0" \ ++ "mmcload=mmc rescan && load mmc 0:2 ${loadaddr} /boot/${bootfile}\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" \ ++ "bootz ${loadaddr}\0" \ + "ubiload=ubi part UBI && ubifsmount ubi0 && " \ +- "ubifsload ${loadaddr} /boot/${bootimage} && " \ +- "ubifsload ${fdt_addr} /boot/${fdtimage}\0" ++ "ubifsload ${loadaddr} /boot/${bootfile}\0" + + /* The rest of the configuration is shared */ + #include <configs/socfpga_common.h> +-- +2.8.0.rc3 + |