linux-fit.inc: delete 'entrypoint' and 'loadaddress' for ramdisk record

in multi.its

Delete entrypoint and loadaddress variables, that were used incorrectly
for ramdisk.

diff --git a/meta-baikal/recipes-kernel/linux/linux-fit.inc b/meta-baikal/recipes-kernel/linux/linux-fit.inc
index e7cf255035f09620c470ff5f5a39e4b809676b9b..9e053c1a75b587a53dbf8b11038a4f6a81db42d7 100644 (file)
--- a/meta-baikal/recipes-kernel/linux/linux-fit.inc
+++ b/meta-baikal/recipes-kernel/linux/linux-fit.inc
@@ -138,15 +138,6 @@ fitimage_emit_section_ramdisk() {
        ramdisk_csum="crc32"
        ramdisk_sign_algo="${FIT_SIGN_ALG}"
        ramdisk_sign_keyname="${UBOOT_SIGN_IMG_KEYNAME}"
-       ramdisk_loadline=""
-       ramdisk_entryline=""
-
-       if [ -n "${UBOOT_RD_LOADADDRESS}" ]; then
-               ramdisk_loadline="load = <${UBOOT_RD_LOADADDRESS}>;"
-       fi
-       if [ -n "${UBOOT_RD_ENTRYPOINT}" ]; then
-               ramdisk_entryline="entry = <${UBOOT_RD_ENTRYPOINT}>;"
-       fi
 
        cat << EOF >> $1
                 ramdisk-$2 {
@@ -156,8 +147,6 @@ fitimage_emit_section_ramdisk() {
                         arch = "${UBOOT_ARCH}";
                         os = "linux";
                         compression = "$4";
-                        $ramdisk_loadline
-                        $ramdisk_entryline
                         hash-1 {
                                 algo = "$ramdisk_csum";
                         };

diff --git a/meta-baikal/recipes-kernel/linux/linux-umulti.inc b/meta-baikal/recipes-kernel/linux/linux-umulti.inc
index a95f982abc2377131e2cb647b915a05422bfcdd3..42173a208a608e35764bd501bd1d71c9bc4ff995 100644 (file)
--- a/meta-baikal/recipes-kernel/linux/linux-umulti.inc
+++ b/meta-baikal/recipes-kernel/linux/linux-umulti.inc
@@ -1,11 +1,5 @@
 require recipes-kernel/linux/linux-fit.inc
 
-UBOOT_RD_LOADADDRESS ?= "0x80000000"
-UBOOT_RD_ENTRYPOINT ?= "0x80000000"
-
-UBOOT_RDI_LOADADDRESS ?= "0x86000000"
-UBOOT_RDI_ENTRYPOINT ?= "0x86000000"
-
 BAIKAL_COMP_ALG ?= "lzma"
 BAIKAL_COMP_ALG_EXTENSION ?= ".lzma"
 
@@ -18,7 +12,6 @@ UBOOT_DTS_FILE = "${WORKDIR}/baikal.dts"
 
 baikal_do_uinitramfs () {
     uboot-mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C ${BAIKAL_COMP_ALG} \
-            -a ${UBOOT_RD_LOADADDRESS} -e ${UBOOT_RD_ENTRYPOINT} \
             -d "${BAIKAL_IMAGES}/initramfs${BAIKAL_COMP_ALG_EXTENSION}" \
             -n "uInitramfs Image for bfk3 board" \
             ${BAIKAL_IMAGES}/${MACHINE}.uInitramfs
@@ -26,7 +19,6 @@ baikal_do_uinitramfs () {
 
 baikal_do_uinitrd () {
     uboot-mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C ${BAIKAL_COMP_ALG} \
-            -a ${UBOOT_RDI_LOADADDRESS} -e ${UBOOT_RDI_ENTRYPOINT} \
             -d "${BAIKAL_IMAGES}/initrd${BAIKAL_COMP_ALG_EXTENSION}" \
             -n "uInitrd Image for bfk3 board" \
             ${BAIKAL_IMAGES}/${MACHINE}.uInitrd