diff options
| author | Luka Perkov <luka@openwrt.org> | 2016-05-10 22:52:00 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2016-06-19 19:35:42 +0200 |
| commit | 9ccd1da444ff320abf069322b6063d7d041cdd20 (patch) | |
| tree | 6e4bf314ba8e2ae7ffd68f166a46977aad676ec8 /package/boot/uboot-socfpga/patches/0002-arm-socfpga-Tweak-SoCkit-default-env-for-OpenWRT.patch | |
| parent | c3d9ae93fd2cfb51ae3e843487edad81545afca4 (diff) | |
| download | master-187ad058-9ccd1da444ff320abf069322b6063d7d041cdd20.tar.gz master-187ad058-9ccd1da444ff320abf069322b6063d7d041cdd20.tar.bz2 master-187ad058-9ccd1da444ff320abf069322b6063d7d041cdd20.zip | |
target: socfpga: Add Altera SoCFPGA support
This patch adds support for the Altera SoCFPGA target.
Both generic target and Terasic SoCkit boards are supported.
Signed-off-by: Marek Vasut <marex@denx.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49367 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/boot/uboot-socfpga/patches/0002-arm-socfpga-Tweak-SoCkit-default-env-for-OpenWRT.patch')
| -rw-r--r-- | package/boot/uboot-socfpga/patches/0002-arm-socfpga-Tweak-SoCkit-default-env-for-OpenWRT.patch | 65 |
1 files changed, 65 insertions, 0 deletions
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 + |