Remove setting of explicit ramdisk load address
U-Boot in Aspeed's SDK had a hack to manually relocate the ramdisk into
RAM because of a bug that caused the normal ramdisk relocation not to
happen if ATAGS was being used. Now that the ATAGS ramdisk relocation
bug is fixed, the load address and entrypoint of a ramdisk image are
ignored. The ramdisk is relocated to an address chosen by U-Boot and
the address is passed to the kernel.
Remove the override of oe_mkimage() in obmc-phosphor-image_types_uboot
as the default implementation is sufficient. This also removes the only
reference to a fixed ramdisk location in RAM.
Change-Id: Id92c8dc9ebeb905401e3056fcf841d982abbd3d1
Signed-off-by: Rick Altherr <raltherr@google.com>
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc
index c8fc6da..94e9a59 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc
@@ -8,9 +8,6 @@
UBOOT_ENTRYPOINT ?= "0x80001000"
UBOOT_LOADADDRESS ?= "0x80001000"
-INITRD_IMAGE_ENTRYPOINT = "0x81000000"
-INITRD_IMAGE_LOADADDRESS = "0x81000000"
-
MACHINE_EXTRA_RDEPENDS += "udev-aspeed-vuart"
DEFAULTTUNE = "armv6-novfp"
diff --git a/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass b/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass
index bb2ddd2..8b015da 100644
--- a/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass
@@ -1,16 +1,5 @@
inherit image_types_uboot
-# oe_mkimage() was defined in image_types_uboot. Howver, it does not consider
-# the image load address and entry point. Override it here.
-
-oe_mkimage () {
- mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C $2 -n ${IMAGE_BASENAME} \
- -a ${INITRD_IMAGE_LOADADDRESS} -e ${INITRD_IMAGE_ENTRYPOINT} \
- -d ${DEPLOY_DIR_IMAGE}/$1 ${DEPLOY_DIR_IMAGE}/$1.u-boot
-}
-
-INITRD_IMAGE_ENTRYPOINT ?= "0x42000000"
-INITRD_IMAGE_LOADADDRESS ?= "${INITRD_IMAGE_ENTRYPOINT}"
INITRD_LINK_NAME = "${INITRD_IMAGE}-${MACHINE}${INITRAMFS_FSTYPE}"
FLASH_IMAGE_NAME ?= "flash-${MACHINE}-${DATETIME}"