diff options
-rw-r--r-- | conf/machine/arria5.conf | 1 | ||||
-rw-r--r-- | conf/machine/cyclone5.conf | 1 | ||||
-rw-r--r-- | recipes-bsp/u-boot/files/v2016.11/cyclone5-socdk.env | 4 | ||||
-rw-r--r-- | recipes-bsp/u-boot/files/v2016.11/de0-nano-soc.env | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/conf/machine/arria5.conf b/conf/machine/arria5.conf index 6eedabf..42036fd 100644 --- a/conf/machine/arria5.conf +++ b/conf/machine/arria5.conf | |||
@@ -19,4 +19,3 @@ KERNEL_DEVICETREE_arria5 ?= " \ | |||
19 | 19 | ||
20 | # Add support for SDCARD creation | 20 | # Add support for SDCARD creation |
21 | IMAGE_CLASSES += "sdcard_image-socfpga" | 21 | IMAGE_CLASSES += "sdcard_image-socfpga" |
22 | SOCFPGA_SDIMG_PARTITION_COMMAND ?= "generate_sdcard_partitions_v2016_11_and_newer" | ||
diff --git a/conf/machine/cyclone5.conf b/conf/machine/cyclone5.conf index a2d743b..7000b03 100644 --- a/conf/machine/cyclone5.conf +++ b/conf/machine/cyclone5.conf | |||
@@ -27,5 +27,4 @@ KERNEL_DEVICETREE ?= "\ | |||
27 | 27 | ||
28 | # Add support for SDCARD creation | 28 | # Add support for SDCARD creation |
29 | IMAGE_CLASSES += "sdcard_image-socfpga" | 29 | IMAGE_CLASSES += "sdcard_image-socfpga" |
30 | SOCFPGA_SDIMG_PARTITION_COMMAND ?= "generate_sdcard_partitions_v2016_11_and_newer" | ||
31 | 30 | ||
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 3ed6ba8..983149f 100644 --- a/recipes-bsp/u-boot/files/v2016.11/cyclone5-socdk.env +++ b/recipes-bsp/u-boot/files/v2016.11/cyclone5-socdk.env | |||
@@ -6,6 +6,6 @@ bootimage=zImage | |||
6 | fdt_addr=100 | 6 | fdt_addr=100 |
7 | loadaddr=0x01000000 | 7 | loadaddr=0x01000000 |
8 | mmcboot=setenv bootargs console=ttyS0,115200 root=${mmcroot} rw rootwait;bootz ${loadaddr} - ${fdt_addr} | 8 | mmcboot=setenv bootargs console=ttyS0,115200 root=${mmcroot} rw rootwait;bootz ${loadaddr} - ${fdt_addr} |
9 | mmcload=mmc rescan;load mmc 0:2 ${loadaddr} ${bootimage};load mmc 0:2 ${fdt_addr} ${fdtimage} | 9 | mmcload=mmc rescan;load mmc 0:1 ${loadaddr} ${bootimage};load mmc 0:1 ${fdt_addr} ${fdtimage} |
10 | mmcroot=/dev/mmcblk0p3 | 10 | mmcroot=/dev/mmcblk0p2 |
11 | ramboot=setenv bootargs console=ttyS0,115200;bootm ${loadaddr} - ${fdt_addr} | 11 | ramboot=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 0e81fa3..3c28f0f 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 | |||
@@ -6,6 +6,6 @@ bootimage=zImage | |||
6 | fdt_addr=100 | 6 | fdt_addr=100 |
7 | loadaddr=0x01000000 | 7 | loadaddr=0x01000000 |
8 | mmcboot=setenv bootargs console=ttyS0,115200 root=${mmcroot} rw rootwait;bootz ${loadaddr} - ${fdt_addr} | 8 | mmcboot=setenv bootargs console=ttyS0,115200 root=${mmcroot} rw rootwait;bootz ${loadaddr} - ${fdt_addr} |
9 | mmcload=mmc rescan;load mmc 0:2 ${loadaddr} ${bootimage};load mmc 0:2 ${fdt_addr} ${fdtimage} | 9 | mmcload=mmc rescan;load mmc 0:1 ${loadaddr} ${bootimage};load mmc 0:1 ${fdt_addr} ${fdtimage} |
10 | mmcroot=/dev/mmcblk0p3 | 10 | mmcroot=/dev/mmcblk0p2 |
11 | ramboot=setenv bootargs console=ttyS0,115200;bootm ${loadaddr} - ${fdt_addr} | 11 | ramboot=setenv bootargs console=ttyS0,115200;bootm ${loadaddr} - ${fdt_addr} |