From: Baikal Electronics <support@baikalelectronics.ru>
Date: Tue, 31 Jan 2023 15:29:18 +0000 (+0300)
Subject: linux-fit.inc: delete 'entrypoint' and 'loadaddress' for ramdisk record
X-Git-Tag: baikal/mips/sdk6.1~13
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=7ff94cf1cfb6394eb2bc1fce7316c94dc87ff445;p=openembedded-baikal.git

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 e7cf255..9e053c1 100644
--- 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 a95f982..42173a2 100644
--- 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