diff options
Diffstat (limited to 'target/arm/Makefile')
| -rw-r--r-- | target/arm/Makefile | 59 |
1 files changed, 39 insertions, 20 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index 1e2cc478b..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)" @@ -85,6 +79,11 @@ ifeq ($(ADK_TARGET_SYSTEM_PHYTEC_IMX6),y) @echo "sudo ./scripts/install.sh phytec-imx6 /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)" @echo endif +ifeq ($(ADK_TARGET_SYSTEM_BEAGEBONE_BLACK),y) + @echo "Use following command to install it on SD card:" + @echo "sudo ./scripts/install.sh beaglebone-black /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)" + @echo +endif ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) @echo "Use following command to install it on SD card:" @echo "sudo ./scripts/install.sh banana-pro /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)" @@ -130,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: @@ -157,7 +152,7 @@ ifeq ($(ADK_TARGET_FS),genimage) targethelp: @echo "The disk image is: $(FW_DIR)/sdcard.img" @echo "Use following command to install it on SD card:" - @echo 'sudo dd if=$(FW_DIR)/sdcard.img of=/dev/sdX bs=2048k' + @echo 'sudo dd if=$(FW_DIR)/sdcard.img of=/dev/sdX bs=32M' endif kernel-strip: @@ -175,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),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 @@ -188,9 +183,27 @@ 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 +ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) +VENDOR:=nxp/imx/ +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: @@ -215,8 +228,8 @@ ifeq ($(ADK_TARGET_SYSTEM_PHYTEC_IMX6),y) cp $(LINUX_DIR)/arch/arm/boot/dts/imx6q-phytec-pbab01.dtb ${TARGET_DIR}/boot endif ifeq ($(ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK),y) - ${KERNEL_MAKE} am335x-boneblack.dtb $(MAKE_TRACE) - cp $(LINUX_DIR)/arch/arm/boot/dts/am335x-boneblack.dtb ${TARGET_DIR}/boot + ${KERNEL_MAKE} $(VENDOR)am335x-boneblack.dtb $(MAKE_TRACE) + cp $(LINUX_DIR)/arch/arm/boot/dts/$(VENDOR)am335x-boneblack.dtb ${TARGET_DIR}/boot endif ifeq ($(ADK_TARGET_BOARD_BCM28XX),y) ${KERNEL_MAKE} dtbs $(MAKE_TRACE) @@ -231,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) @@ -240,11 +256,11 @@ ifeq ($(ADK_TARGET_SYSTEM_BANANA_P2_ZERO),y) ${KERNEL_MAKE} sun8i-h2-plus-bananapi-m2-zero.dtb $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) - ${KERNEL_MAKE} imx6q-cubox-i.dtb imx6dl-cubox-i.dtb \ - imx6dl-hummingboard.dtb imx6q-hummingboard.dtb $(MAKE_TRACE) + ${KERNEL_MAKE} $(VENDOR)imx6q-cubox-i.dtb $(VENDOR)imx6dl-cubox-i.dtb \ + $(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) @@ -255,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; \ @@ -277,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 |