From f096a2ea9871ab087e36cd0044a3875d03b98799 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 13 Jun 2018 23:21:58 +0100 Subject: [PATCH] flash-image+cdrom: Execute ARMv5-specific code on ARMv5 Signed-off-by: Michael Tremer --- lfs/cdrom | 4 ++-- lfs/flash-images | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/cdrom b/lfs/cdrom index 7150153d70..f677493a38 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -45,7 +45,7 @@ ISO_ARGS = -J -r -v \ -c boot/isolinux/boot.catalog # Only build a stub ISO for ARM -ifeq "$(BUILD_PLATFORM)" "arm" +ifeq "$(BUILD_ARCH)" "armv5tel" ISO_ARGS = -J -r -V "$(NAME) $(VERSION) $(BUILD_ARCH)" endif @@ -112,7 +112,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Make the ISO mkdir -p /install/cdrom/boot/isolinux dd if=/dev/zero bs=1k count=2 > /install/cdrom/boot/isolinux/boot.catalog -ifneq "$(BUILD_PLATFORM)" "arm" +ifneq "$(BUILD_ARCH)" "armv5tel" cp /boot/vmlinuz-$(KVER)-ipfire /install/cdrom/boot/isolinux/vmlinuz dracut --force -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire cp $(DIR_SRC)/config/syslinux/boot.png /install/cdrom/boot/isolinux/boot.png diff --git a/lfs/flash-images b/lfs/flash-images index 5134fd672c..24cf327a52 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -59,7 +59,7 @@ MNThdd := /install/harddisk IMG := /install/images/image.img # All sizes in blocks -ifeq "$(BUILD_PLATFORM)" "arm" +ifeq "$(BUILD_ARCH)" "armv5tel" BOOTLOADER = S_OFFSET = 8192 -- 2.39.2