summaryrefslogtreecommitdiff
path: root/target/arm/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'target/arm/Makefile')
-rw-r--r--target/arm/Makefile38
1 files changed, 23 insertions, 15 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile
index 255d5c793..227cc97ca 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -23,12 +23,6 @@ QEMU_ARGS:=${ADK_QEMU_ARGS}
ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ),y)
QEMU_ARGS+=-M xilinx-zynq-a9 -dtb $(FW_DIR)/zynq-zc702.dtb -serial null -serial mon:stdio
endif
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ),y)
-QEMU_ARGS+=-M spitz
-endif
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER),y)
-QEMU_ARGS+=-M terrier
-endif
ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE),y)
QEMU_ARGS+=-M realview-eb-mpcore -net user -net nic -dtb $(FW_DIR)/arm-realview-eb-11mp-ctrevb.dtb
endif
@@ -50,7 +44,7 @@ ifeq ($(ADK_TARGET_FS),archive)
targethelp:
@echo "#################################################"
@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER)$(ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y)
@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
@echo "Use following command to create a QEMU Image:"
@echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
@@ -135,10 +129,6 @@ ifeq ($(ADK_TARGET_FS),nfsroot)
targethelp:
@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)"
-ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_NSLU2),y)
- @echo "Use following in RedBoot bootloader:"
- @echo "RedBoot> ip_address -l <localip> -h <serverip>; load -r -v -b 0x01d00000 ${TARGET_KERNEL}; exec 0x01d00000"
-endif
endif
ifeq ($(ADK_TARGET_FS),squashfs)
targethelp:
@@ -180,7 +170,7 @@ ifeq ($(ADK_TARGET_FS),squashfs)
dd conv=notrunc if=$(BUILD_DIR)/root.squashfs of=$(FW_DIR)/$(ROOTFSSQUASHFS)
endif
-ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6)$(ADK_TARGET_LINUX_KERNEL_VERSION_6_9)$(ADK_TARGET_LINUX_KERNEL_VERSION_GIT),y)
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6)$(ADK_TARGET_LINUX_KERNEL_VERSION_6_12)$(ADK_TARGET_LINUX_KERNEL_VERSION_GIT),y)
ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y)
VENDOR:=arm/
endif
@@ -193,6 +183,9 @@ endif
ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ),y)
VENDOR:=xilinx/
endif
+ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG),y)
+VENDOR:=marvell/
+endif
ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F746G),y)
VENDOR:=st/
endif
@@ -202,6 +195,15 @@ endif
ifeq ($(ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK),y)
VENDOR:=ti/omap/
endif
+ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y)
+VENDOR:=allwinner/
+endif
+ifeq ($(ADK_TARGET_SYSTEM_PCDUINO_3B),y)
+VENDOR:=allwinner/
+endif
+ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_NSLU2),y)
+VENDOR:=intel/ixp/
+endif
endif
dtb-install:
@@ -242,7 +244,10 @@ ifeq ($(ADK_TARGET_BOARD_BCM28XX),y)
done
endif
ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y)
- ${KERNEL_MAKE} sun7i-a20-bananapro.dtb $(MAKE_TRACE)
+ ${KERNEL_MAKE} $(VENDOR)sun7i-a20-bananapro.dtb $(MAKE_TRACE)
+endif
+ifeq ($(ADK_TARGET_SYSTEM_PCDUINO_3B),y)
+ ${KERNEL_MAKE} $(VENDOR)sun7i-a20-pcduino3.dtb $(MAKE_TRACE)
endif
ifeq ($(ADK_TARGET_SYSTEM_ORANGE_PI0),y)
${KERNEL_MAKE} sun8i-h2-plus-orangepi-zero.dtb $(MAKE_TRACE)
@@ -255,7 +260,7 @@ ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
$(VENDOR)imx6dl-hummingboard.dtb $(VENDOR)imx6q-hummingboard.dtb $(MAKE_TRACE)
endif
ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG),y)
- ${KERNEL_MAKE} armada-388-clearfog.dtb $(MAKE_TRACE)
+ ${KERNEL_MAKE} $(VENDOR)armada-388-clearfog.dtb $(MAKE_TRACE)
endif
ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F429),y)
${KERNEL_MAKE} dtbs $(MAKE_TRACE)
@@ -266,6 +271,9 @@ endif
ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F746G),y)
${KERNEL_MAKE} $(VENDOR)stm32f746-disco.dtb $(MAKE_TRACE)
endif
+ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_NSLU2),y)
+ ${KERNEL_MAKE} $(VENDOR)intel-ixp42x-linksys-nslu2.dtb $(MAKE_TRACE)
+endif
for x in $(LINUX_DIR)/arch/arm/boot/dts/$(VENDOR)*.dtb; do \
[[ -e "$$x" ]] && cp $(LINUX_DIR)/arch/arm/boot/dts/$(VENDOR)*.dtb $(FW_DIR); \
break; \
@@ -288,7 +296,7 @@ ifeq (${ADK_TARGET_FS},genimage)
imageinstall: dtb-install $(FW_DIR)/$(GENIMAGE) targethelp
endif
ifeq ($(ADK_TARGET_FS),nfsroot)
-imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp
+imageinstall: kernel-install dtb-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp
endif
ifeq ($(ADK_TARGET_FS),squashfs)
imageinstall: $(BUILD_DIR)/root.squashfs kernel-install dtb-install targethelp