From e651e4ea20fd639383330fc298d45bd34f7ccd83 Mon Sep 17 00:00:00 2001 From: Dalon Westergreen Date: Mon, 30 Jan 2017 16:29:47 -0800 Subject: Update CV / AV configuration to use older partitions Signed-off-by: Dalon Westergreen --- conf/machine/arria5.conf | 1 - conf/machine/cyclone5.conf | 1 - recipes-bsp/u-boot/files/v2016.11/cyclone5-socdk.env | 4 ++-- 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 ?= " \ # Add support for SDCARD creation IMAGE_CLASSES += "sdcard_image-socfpga" -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 ?= "\ # Add support for SDCARD creation IMAGE_CLASSES += "sdcard_image-socfpga" -SOCFPGA_SDIMG_PARTITION_COMMAND ?= "generate_sdcard_partitions_v2016_11_and_newer" 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 fdt_addr=100 loadaddr=0x01000000 mmcboot=setenv bootargs console=ttyS0,115200 root=${mmcroot} rw rootwait;bootz ${loadaddr} - ${fdt_addr} -mmcload=mmc rescan;load mmc 0:2 ${loadaddr} ${bootimage};load mmc 0:2 ${fdt_addr} ${fdtimage} -mmcroot=/dev/mmcblk0p3 +mmcload=mmc rescan;load mmc 0:1 ${loadaddr} ${bootimage};load mmc 0:1 ${fdt_addr} ${fdtimage} +mmcroot=/dev/mmcblk0p2 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 fdt_addr=100 loadaddr=0x01000000 mmcboot=setenv bootargs console=ttyS0,115200 root=${mmcroot} rw rootwait;bootz ${loadaddr} - ${fdt_addr} -mmcload=mmc rescan;load mmc 0:2 ${loadaddr} ${bootimage};load mmc 0:2 ${fdt_addr} ${fdtimage} -mmcroot=/dev/mmcblk0p3 +mmcload=mmc rescan;load mmc 0:1 ${loadaddr} ${bootimage};load mmc 0:1 ${fdt_addr} ${fdtimage} +mmcroot=/dev/mmcblk0p2 ramboot=setenv bootargs console=ttyS0,115200;bootm ${loadaddr} - ${fdt_addr} -- cgit v1.2.3-54-g00ecf