diff options
-rw-r--r-- | classes/sdcard_image-socfpga.bbclass | 9 | ||||
-rw-r--r-- | recipes-bsp/u-boot/files/v2016.11/de0-nano-soc.env | 11 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-mkenvimage_v2016.11.bb | 23 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-socfpga-env.inc | 25 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-socfpga_v2016.05.bb | 2 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-socfpga_v2016.11.bb | 6 |
6 files changed, 74 insertions, 2 deletions
diff --git a/classes/sdcard_image-socfpga.bbclass b/classes/sdcard_image-socfpga.bbclass index 879c2c1..8ac12b1 100644 --- a/classes/sdcard_image-socfpga.bbclass +++ b/classes/sdcard_image-socfpga.bbclass | |||
@@ -24,6 +24,9 @@ BOOT_SPACE ?= "2048" | |||
24 | # Fat partition size | 24 | # Fat partition size |
25 | FAT_SPACE ?= "102400" | 25 | FAT_SPACE ?= "102400" |
26 | 26 | ||
27 | # uBoot ENV offset | ||
28 | SDIMG_UBOOT_ENV_OFFSET ?= "512" | ||
29 | |||
27 | # Boot partition begin at sector 1024 | 30 | # Boot partition begin at sector 1024 |
28 | # This is required as for c5/a5 mainline uboot hard codes the location | 31 | # This is required as for c5/a5 mainline uboot hard codes the location |
29 | # of the uboot image in the sdcard to 0xa00 sector | 32 | # of the uboot image in the sdcard to 0xa00 sector |
@@ -167,6 +170,10 @@ IMAGE_CMD_socfpga-sdimg () { | |||
167 | dd if=${DEPLOY_DIR_IMAGE}/${SPL_BINARY} of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync | 170 | dd if=${DEPLOY_DIR_IMAGE}/${SPL_BINARY} of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync |
168 | else | 171 | else |
169 | bbfatal "${SPL_BINARY} does not exist." | 172 | bbfatal "${SPL_BINARY} does not exist." |
170 | fi | 173 | fi |
174 | |||
175 | if [ -e "${DEPLOY_DIR_IMAGE}/u-boot-env-${ENV_BASE_NAME}.bin" ]; then | ||
176 | dd if=${DEPLOY_DIR_IMAGE}/u-boot-env-${ENV_BASE_NAME}.bin of=${SDIMG} bs=1 seek=${SDIMG_UBOOT_ENV_OFFSET} | ||
177 | fi | ||
171 | 178 | ||
172 | } | 179 | } |
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 new file mode 100644 index 0000000..0e81fa3 --- /dev/null +++ b/recipes-bsp/u-boot/files/v2016.11/de0-nano-soc.env | |||
@@ -0,0 +1,11 @@ | |||
1 | baudrate=115200 | ||
2 | bootargs=console=ttyS0,115200 | ||
3 | bootcmd=run mmcload; run mmcboot | ||
4 | fdtimage=socfpga_cyclone5_de0_sockit.dtb | ||
5 | bootimage=zImage | ||
6 | fdt_addr=100 | ||
7 | loadaddr=0x01000000 | ||
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} | ||
10 | mmcroot=/dev/mmcblk0p3 | ||
11 | ramboot=setenv bootargs console=ttyS0,115200;bootm ${loadaddr} - ${fdt_addr} | ||
diff --git a/recipes-bsp/u-boot/u-boot-mkenvimage_v2016.11.bb b/recipes-bsp/u-boot/u-boot-mkenvimage_v2016.11.bb new file mode 100644 index 0000000..cab156a --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-mkenvimage_v2016.11.bb | |||
@@ -0,0 +1,23 @@ | |||
1 | SUMMARY = "U-Boot bootloader environment image creation tool" | ||
2 | |||
3 | require u-boot-socfpga-common.inc | ||
4 | |||
5 | # This revision corresponds to the tag "v2016.11" | ||
6 | # We use the revision in order to avoid having to fetch it from the | ||
7 | # repo during parse | ||
8 | SRCREV = "29e0cfb4f77f7aa369136302cee14a91e22dca71" | ||
9 | |||
10 | EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1' | ||
11 | |||
12 | do_compile () { | ||
13 | oe_runmake sandbox_defconfig | ||
14 | oe_runmake cross_tools NO_SDL=1 | ||
15 | } | ||
16 | |||
17 | do_install () { | ||
18 | install -d ${D}${bindir} | ||
19 | install -m 0755 tools/mkenvimage ${D}${bindir}/uboot-mkenvimage | ||
20 | ln -sf uboot-mkenvimage ${D}${bindir}/mkenvimage | ||
21 | } | ||
22 | |||
23 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/recipes-bsp/u-boot/u-boot-socfpga-env.inc b/recipes-bsp/u-boot/u-boot-socfpga-env.inc new file mode 100644 index 0000000..55621b9 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-socfpga-env.inc | |||
@@ -0,0 +1,25 @@ | |||
1 | DEPENDS += "u-boot-mkenvimage-native" | ||
2 | |||
3 | #Env binary size | ||
4 | ENV_SIZE = "4096" | ||
5 | |||
6 | #Env base Name | ||
7 | ENV_BASE_NAME ??= "${UBOOT_CONFIG}" | ||
8 | |||
9 | # Env base file correspond to common part of all environment | ||
10 | ENV_BASE_FILE = "${WORKDIR}/${ENV_BASE_NAME}.env" | ||
11 | |||
12 | do_environment_mkimage() { | ||
13 | if [ -e ${WORKDIR}/${PV}/${ENV_BASE_NAME}.env ]; then | ||
14 | mkenvimage -s ${ENV_SIZE} -o ${WORKDIR}/${ENV_BASE_NAME}.bin ${WORKDIR}/${PV}/${ENV_BASE_NAME}.env | ||
15 | fi | ||
16 | } | ||
17 | |||
18 | do_deploy_append() { | ||
19 | if [ -e ${WORKDIR}/${ENV_BASE_NAME}.bin]; then | ||
20 | install -d ${DEPLOYDIR} | ||
21 | install -m 644 ${WORKDIR}/${ENV_BASE_NAME}.bin ${DEPLOYDIR}/u-boot-env-${ENV_BASE_NAME}.bin | ||
22 | fi | ||
23 | } | ||
24 | |||
25 | addtask environment_mkimage after do_compile before do_deploy | ||
diff --git a/recipes-bsp/u-boot/u-boot-socfpga_v2016.05.bb b/recipes-bsp/u-boot/u-boot-socfpga_v2016.05.bb index 40281cb..526e22c 100644 --- a/recipes-bsp/u-boot/u-boot-socfpga_v2016.05.bb +++ b/recipes-bsp/u-boot/u-boot-socfpga_v2016.05.bb | |||
@@ -5,5 +5,5 @@ require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc | |||
5 | # We use the revision in order to avoid having to fetch it from the | 5 | # We use the revision in order to avoid having to fetch it from the |
6 | # repo during parse | 6 | # repo during parse |
7 | SRCREV = "aeaec0e682f45b9e0c62c522fafea353931f73ed" | 7 | SRCREV = "aeaec0e682f45b9e0c62c522fafea353931f73ed" |
8 | 8 | PR = "r1" | |
9 | DEPENDS += "dtc-native" | 9 | DEPENDS += "dtc-native" |
diff --git a/recipes-bsp/u-boot/u-boot-socfpga_v2016.11.bb b/recipes-bsp/u-boot/u-boot-socfpga_v2016.11.bb index 0204422..356f88a 100644 --- a/recipes-bsp/u-boot/u-boot-socfpga_v2016.11.bb +++ b/recipes-bsp/u-boot/u-boot-socfpga_v2016.11.bb | |||
@@ -1,4 +1,5 @@ | |||
1 | require u-boot-socfpga-common.inc | 1 | require u-boot-socfpga-common.inc |
2 | require u-boot-socfpga-env.inc | ||
2 | require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc | 3 | require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc |
3 | 4 | ||
4 | # This revision corresponds to the tag "v2016.11" | 5 | # This revision corresponds to the tag "v2016.11" |
@@ -6,4 +7,9 @@ require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc | |||
6 | # repo during parse | 7 | # repo during parse |
7 | SRCREV = "29e0cfb4f77f7aa369136302cee14a91e22dca71" | 8 | SRCREV = "29e0cfb4f77f7aa369136302cee14a91e22dca71" |
8 | 9 | ||
10 | SRC_URI_append = "\ | ||
11 | file://v2016.11/de0-nano-soc.env \ | ||
12 | " | ||
13 | PR = "r1" | ||
14 | |||
9 | DEPENDS += "dtc-native" | 15 | DEPENDS += "dtc-native" |