summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/machine/include/socfpga.inc2
-rw-r--r--recipes-bsp/u-boot/files/v2016.11/cyclone5-socdk.env2
-rw-r--r--recipes-bsp/u-boot/files/v2016.11/de0-nano-soc.env2
-rw-r--r--recipes-bsp/u-boot/files/v2017.07/cyclone5-socdk.env2
-rw-r--r--recipes-bsp/u-boot/files/v2017.07/de0-nano-soc.env2
-rw-r--r--wic/sdimage-cyclone5-arria5.wks2
6 files changed, 6 insertions, 6 deletions
diff --git a/conf/machine/include/socfpga.inc b/conf/machine/include/socfpga.inc
index 8b577e0..7e8d9c4 100644
--- a/conf/machine/include/socfpga.inc
+++ b/conf/machine/include/socfpga.inc
@@ -34,7 +34,7 @@ SPL_BINARY_arria5 = "u-boot-with-spl.sfp"
34 34
35# Set extlinux.conf up 35# Set extlinux.conf up
36UBOOT_EXTLINUX ??= "0" 36UBOOT_EXTLINUX ??= "0"
37UBOOT_EXTLINUX_ROOT ?= "root=/dev/mmcblk0p2" 37UBOOT_EXTLINUX_ROOT ?= "root=/dev/mmcblk0p3"
38UBOOT_EXTLINUX_LABELS ?= "default" 38UBOOT_EXTLINUX_LABELS ?= "default"
39UBOOT_EXTLINUX_CONSOLE ?= "earlycon" 39UBOOT_EXTLINUX_CONSOLE ?= "earlycon"
40UBOOT_EXTLINUX_MENU_DESCRIPTION_default ?= "Linux Default" 40UBOOT_EXTLINUX_MENU_DESCRIPTION_default ?= "Linux Default"
diff --git a/recipes-bsp/u-boot/files/v2016.11/cyclone5-socdk.env b/recipes-bsp/u-boot/files/v2016.11/cyclone5-socdk.env
index 983149f..15c329f 100644
--- a/recipes-bsp/u-boot/files/v2016.11/cyclone5-socdk.env
+++ b/recipes-bsp/u-boot/files/v2016.11/cyclone5-socdk.env
@@ -7,5 +7,5 @@ fdt_addr=100
7loadaddr=0x01000000 7loadaddr=0x01000000
8mmcboot=setenv bootargs console=ttyS0,115200 root=${mmcroot} rw rootwait;bootz ${loadaddr} - ${fdt_addr} 8mmcboot=setenv bootargs console=ttyS0,115200 root=${mmcroot} rw rootwait;bootz ${loadaddr} - ${fdt_addr}
9mmcload=mmc rescan;load mmc 0:1 ${loadaddr} ${bootimage};load mmc 0:1 ${fdt_addr} ${fdtimage} 9mmcload=mmc rescan;load mmc 0:1 ${loadaddr} ${bootimage};load mmc 0:1 ${fdt_addr} ${fdtimage}
10mmcroot=/dev/mmcblk0p2 10mmcroot=/dev/mmcblk0p3
11ramboot=setenv bootargs console=ttyS0,115200;bootm ${loadaddr} - ${fdt_addr} 11ramboot=setenv bootargs console=ttyS0,115200;bootm ${loadaddr} - ${fdt_addr}
diff --git a/recipes-bsp/u-boot/files/v2016.11/de0-nano-soc.env b/recipes-bsp/u-boot/files/v2016.11/de0-nano-soc.env
index 3c28f0f..b7d69cb 100644
--- a/recipes-bsp/u-boot/files/v2016.11/de0-nano-soc.env
+++ b/recipes-bsp/u-boot/files/v2016.11/de0-nano-soc.env
@@ -7,5 +7,5 @@ fdt_addr=100
7loadaddr=0x01000000 7loadaddr=0x01000000
8mmcboot=setenv bootargs console=ttyS0,115200 root=${mmcroot} rw rootwait;bootz ${loadaddr} - ${fdt_addr} 8mmcboot=setenv bootargs console=ttyS0,115200 root=${mmcroot} rw rootwait;bootz ${loadaddr} - ${fdt_addr}
9mmcload=mmc rescan;load mmc 0:1 ${loadaddr} ${bootimage};load mmc 0:1 ${fdt_addr} ${fdtimage} 9mmcload=mmc rescan;load mmc 0:1 ${loadaddr} ${bootimage};load mmc 0:1 ${fdt_addr} ${fdtimage}
10mmcroot=/dev/mmcblk0p2 10mmcroot=/dev/mmcblk0p3
11ramboot=setenv bootargs console=ttyS0,115200;bootm ${loadaddr} - ${fdt_addr} 11ramboot=setenv bootargs console=ttyS0,115200;bootm ${loadaddr} - ${fdt_addr}
diff --git a/recipes-bsp/u-boot/files/v2017.07/cyclone5-socdk.env b/recipes-bsp/u-boot/files/v2017.07/cyclone5-socdk.env
index 983149f..15c329f 100644
--- a/recipes-bsp/u-boot/files/v2017.07/cyclone5-socdk.env
+++ b/recipes-bsp/u-boot/files/v2017.07/cyclone5-socdk.env
@@ -7,5 +7,5 @@ fdt_addr=100
7loadaddr=0x01000000 7loadaddr=0x01000000
8mmcboot=setenv bootargs console=ttyS0,115200 root=${mmcroot} rw rootwait;bootz ${loadaddr} - ${fdt_addr} 8mmcboot=setenv bootargs console=ttyS0,115200 root=${mmcroot} rw rootwait;bootz ${loadaddr} - ${fdt_addr}
9mmcload=mmc rescan;load mmc 0:1 ${loadaddr} ${bootimage};load mmc 0:1 ${fdt_addr} ${fdtimage} 9mmcload=mmc rescan;load mmc 0:1 ${loadaddr} ${bootimage};load mmc 0:1 ${fdt_addr} ${fdtimage}
10mmcroot=/dev/mmcblk0p2 10mmcroot=/dev/mmcblk0p3
11ramboot=setenv bootargs console=ttyS0,115200;bootm ${loadaddr} - ${fdt_addr} 11ramboot=setenv bootargs console=ttyS0,115200;bootm ${loadaddr} - ${fdt_addr}
diff --git a/recipes-bsp/u-boot/files/v2017.07/de0-nano-soc.env b/recipes-bsp/u-boot/files/v2017.07/de0-nano-soc.env
index 3c28f0f..b7d69cb 100644
--- a/recipes-bsp/u-boot/files/v2017.07/de0-nano-soc.env
+++ b/recipes-bsp/u-boot/files/v2017.07/de0-nano-soc.env
@@ -7,5 +7,5 @@ fdt_addr=100
7loadaddr=0x01000000 7loadaddr=0x01000000
8mmcboot=setenv bootargs console=ttyS0,115200 root=${mmcroot} rw rootwait;bootz ${loadaddr} - ${fdt_addr} 8mmcboot=setenv bootargs console=ttyS0,115200 root=${mmcroot} rw rootwait;bootz ${loadaddr} - ${fdt_addr}
9mmcload=mmc rescan;load mmc 0:1 ${loadaddr} ${bootimage};load mmc 0:1 ${fdt_addr} ${fdtimage} 9mmcload=mmc rescan;load mmc 0:1 ${loadaddr} ${bootimage};load mmc 0:1 ${fdt_addr} ${fdtimage}
10mmcroot=/dev/mmcblk0p2 10mmcroot=/dev/mmcblk0p3
11ramboot=setenv bootargs console=ttyS0,115200;bootm ${loadaddr} - ${fdt_addr} 11ramboot=setenv bootargs console=ttyS0,115200;bootm ${loadaddr} - ${fdt_addr}
diff --git a/wic/sdimage-cyclone5-arria5.wks b/wic/sdimage-cyclone5-arria5.wks
index 2514c8f..774192f 100644
--- a/wic/sdimage-cyclone5-arria5.wks
+++ b/wic/sdimage-cyclone5-arria5.wks
@@ -4,5 +4,5 @@
4# the third partition. 4# the third partition.
5 5
6part --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4 --size 16 6part --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4 --size 16
7part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4
8part --source rawcopy --sourceparams="file=u-boot-with-spl.sfp" --ondisk mmcblk --system-id=a2 --align 4 --fixed-size 1M 7part --source rawcopy --sourceparams="file=u-boot-with-spl.sfp" --ondisk mmcblk --system-id=a2 --align 4 --fixed-size 1M
8part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4