From b4c357066695181864a9f9e91bb1bc5ef18e18c8 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Fri, 13 Oct 2017 23:40:03 +0200 Subject: [PATCH] uboot-at91: multiple build fixes This fixes the following problems: * Add BUILD_DEVICES for legacy subtarget * Use features from u-boot.mk for sama5 subtarget This is mainly done by changing the prefix from uboot to U-Boot. This makes them depend on the sama5 subtarget and not selectable for the legacy subtarget any more Signed-off-by: Hauke Mehrtens --- package/boot/uboot-at91/Makefile | 44 +++++++++++++++++--------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/package/boot/uboot-at91/Makefile b/package/boot/uboot-at91/Makefile index 8dc5e3ea3d..7c420f1262 100644 --- a/package/boot/uboot-at91/Makefile +++ b/package/boot/uboot-at91/Makefile @@ -23,51 +23,53 @@ endef define U-Boot/at91sam9m10g45ek_nandflash NAME:=AT91SAM9M10G45-EK board (NandFlash) BUILD_SUBTARGET:=legacy + BUILD_DEVICES:=at91sam9m10g45ek endef define U-Boot/at91sam9x5ek_nandflash NAME:=AT91SAM9X5-EK board (NandFlash) BUILD_SUBTARGET:=legacy + BUILD_DEVICES:=at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek endef -define uboot/sama5d3_xplained_nandflash - TITLE:=U-Boot for the SAMA5D3 Xplained board (NandFlash) +define U-Boot/sama5d3_xplained_nandflash + NAME:=SAMA5D3 Xplained board (NandFlash) BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d3_xplained endef -define uboot/sama5d3_xplained_mmc - TITLE:=U-Boot for the SAMA5D3 Xplained board (SDcard) +define U-Boot/sama5d3_xplained_mmc + NAME:=SAMA5D3 Xplained board (SDcard) BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d3_xplained endef -define uboot/sama5d2_xplained_spiflash - TITLE:=U-Boot for the SAMA5D2 Xplained board (SPI Flash) +define U-Boot/sama5d2_xplained_spiflash + NAME:=SAMA5D2 Xplained board (SPI Flash) BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d2_xplained endef -define uboot/sama5d2_xplained_mmc - TITLE:=U-Boot for the SAMA5D2 Xplained board (SDcard/EMMC) +define U-Boot/sama5d2_xplained_mmc + NAME:=SAMA5D2 Xplained board (SDcard/EMMC) BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d2_xplained endef -define uboot/sama5d4_xplained_spiflash - TITLE:=U-Boot for the SAMA5D4 Xplained board (SPI Flash) +define U-Boot/sama5d4_xplained_spiflash + NAME:=SAMA5D4 Xplained board (SPI Flash) BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d4_xplained endef -define uboot/sama5d4_xplained_mmc - TITLE:=U-Boot for the SAMA5D4 Xplained board (SDcard) +define U-Boot/sama5d4_xplained_mmc + NAME:=SAMA5D4 Xplained board (SDcard) BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d4_xplained endef -define uboot/sama5d4_xplained_nandflash - TITLE:=U-Boot for the SAMA5D4 Xplained board (NandFlash) +define U-Boot/sama5d4_xplained_nandflash + NAME:=SAMA5D4 Xplained board (NandFlash) BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d4_xplained endef @@ -75,13 +77,13 @@ endef UBOOT_TARGETS := \ at91sam9m10g45ek_nandflash \ at91sam9x5ek_nandflash \ - sama5d3_xplained_nandflash \ - sama5d3_xplained_mmc \ - sama5d2_xplained_mmc \ - sama5d2_xplained_spiflash \ - sama5d4_xplained_mmc \ - sama5d4_xplained_spiflash \ - sama5d4_xplained_nandflash + sama5d3_xplained_nandflash \ + sama5d3_xplained_mmc \ + sama5d2_xplained_mmc \ + sama5d2_xplained_spiflash \ + sama5d4_xplained_mmc \ + sama5d4_xplained_spiflash \ + sama5d4_xplained_nandflash define Build/Compile +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ -- 2.30.2