remove arm foundation model sample, bit rotted. better use qemu sample for aarch64

9 files changed, 1 insertions, 104 deletions

diff --git a/package/boot-wrapper-aarch64/Makefile b/package/boot-wrapper-aarch64/Makefile
deleted file mode 100644
index 73957fb84..000000000
--- a/package/boot-wrapper-aarch64/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		boot-wrapper-aarch64
-PKG_VERSION:=		0.1
-PKG_RELEASE:=		1
-PKG_HASH:=		e8de5beb585d46c2aec4b30aa8ba96b21bed5749ca1bcdd0b2fdaf95dab7ab4c
-PKG_DESCR:=		boot-wrapper for aarch64
-PKG_SECTION:=		base/boot
-PKG_SITES:=		http://distfiles.openadk.org/
-
-PKG_SYSTEM_DEPENDS:=	arm-fm
-
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,BOOT_WRAPPER_AARCH64,boot-wrapper-aarch64,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-AUTOTOOL_STYLE:=	autoreconf
-CONFIGURE_ARGS+=	--with-kernel-dir=${LINUX_DIR}
-
-boot-wrapper-aarch64-install:
-	${CP} ${WRKBUILD}/linux-system.axf ${LINUX_DIR}
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/boot-wrapper-aarch64/patches/patch-Makefile_am b/package/boot-wrapper-aarch64/patches/patch-Makefile_am
deleted file mode 100644
index 40eb83f2a..000000000
--- a/package/boot-wrapper-aarch64/patches/patch-Makefile_am
+++ /dev/null
@@ -1,13 +0,0 @@
---- boot-wrapper-aarch64-0.1.orig/Makefile.am	2014-04-13 21:10:47.000000000 +0200
-+++ boot-wrapper-aarch64-0.1/Makefile.am	2014-04-13 21:58:16.848991221 +0200
-@@ -83,8 +83,8 @@ $(IMAGE): boot.o cache.o gic.o mmu.o ns.
- model.lds: $(LD_SCRIPT) Makefile
- 	$(CPP) $(CPPFLAGS) -ansi -DPHYS_OFFSET=$(PHYS_OFFSET) -DMBOX_OFFSET=$(MBOX_OFFSET) -DKERNEL_OFFSET=$(KERNEL_OFFSET) -DFDT_OFFSET=$(FDT_OFFSET) -DFS_OFFSET=$(FS_OFFSET) -DKERNEL=$(KERNEL_IMAGE) -DFILESYSTEM=$(FILESYSTEM) -DBOOTMETHOD=$(BOOTMETHOD) -P -C -o $@ $<
- 
--fdt.dtb: $(KERNEL_DTB) Makefile gen-cpu-nodes.sh
--	( $(DTC) -O dts -I dtb $(KERNEL_DTB) ; echo "/ { $(CHOSEN_NODE) $(PSCI_NODE) $(CPUS_NODE) };" ) | $(DTC) -O dtb -o $@ -
-+fdt.dtb: $(KERNEL_DTS) Makefile gen-cpu-nodes.sh
-+	( cat $(KERNEL_DTS) ; echo "/ { $(CHOSEN_NODE) $(PSCI_NODE) $(CPUS_NODE) };" ) | $(DTC) -O dtb -o $@ -
- 
- # The filesystem archive might not exist if INITRD is not being used
- .PHONY: all clean $(FILESYSTEM)
diff --git a/package/boot-wrapper-aarch64/patches/patch-configure_ac b/package/boot-wrapper-aarch64/patches/patch-configure_ac
deleted file mode 100644
index 1a016cf2e..000000000
--- a/package/boot-wrapper-aarch64/patches/patch-configure_ac
+++ /dev/null
@@ -1,23 +0,0 @@
---- boot-wrapper-aarch64-0.1.orig/configure.ac	2014-04-13 21:10:47.000000000 +0200
-+++ boot-wrapper-aarch64-0.1/configure.ac	2014-04-13 21:58:39.944973128 +0200
-@@ -22,18 +22,10 @@ AC_ARG_WITH([kernel-dir],
- 	AC_SUBST([KERN_DIR], [$withval]),
- 	AC_MSG_ERROR([No kernel directory specified. Use --with-kernel-dir]))
- KERN_IMAGE=/arch/arm64/boot/Image
--KERN_DTB=/arch/arm64/boot/dts/rtsm_ve-aemv8a.dtb
--
--# Ensure that the user has provided us with a sane kernel dir.
--m4_define([CHECKFILES], [KERN_DIR,
--	KERN_DIR$KERN_DTB,
--	KERN_DIR$KERN_IMAGE])
--
--m4_foreach([checkfile], [CHECKFILES],
--	[AC_CHECK_FILE([$checkfile], [], AC_MSG_ERROR([No such file or directory: $checkfile]))])
-+KERN_DTS=/arch/arm64/boot/dts/foundation-v8.dts
- 
- AC_SUBST([KERNEL_IMAGE], [$KERN_DIR$KERN_IMAGE])
--AC_SUBST([KERNEL_DTB], [$KERN_DIR$KERN_DTB])
-+AC_SUBST([KERNEL_DTS], [$KERN_DIR$KERN_DTS])
- 
- # Allow a user to pass --enable-psci
- USE_PSCI=no
diff --git a/target/aarch64/Makefile b/target/aarch64/Makefile
index 58f016796..34a2b8ecd 100644
--- a/target/aarch64/Makefile
+++ b/target/aarch64/Makefile
@@ -45,10 +45,6 @@ endif
 ifeq ($(ADK_TARGET_FS),initramfspiggyback)
 targethelp:
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
-ifeq ($(ADK_TARGET_SYSTEM_ARM_FM),y)
-	@echo 'Start emulator via:'
-	@echo 'Foundation_v8 --image=$(FW_DIR)/${TARGET_KERNEL}'
-endif
 ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)'
@@ -59,18 +55,7 @@ kernel-strip:
 	@cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
 
 kernel-install: kernel-strip
-ifeq ($(ADK_TARGET_SYSTEM_ARM_FM),y)
-	cd $(ADK_TOPDIR) && \
-		make -f Makefile \
-		-C package/boot-wrapper-aarch64 clean
-	cd $(ADK_TOPDIR) && \
-		make -f Makefile \
-		-C package/boot-wrapper-aarch64 package
-	${CP} ${LINUX_DIR}/linux-system.axf \
-		$(FW_DIR)/$(TARGET_KERNEL)
-else
 	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
-endif
 
 # filesystem specific targets
 ifeq ($(ADK_TARGET_FS),archive)
diff --git a/target/aarch64/kernel/arm-fm b/target/aarch64/kernel/arm-fm
deleted file mode 100644
index 291b4093e..000000000
--- a/target/aarch64/kernel/arm-fm
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_ARM64=y
-CONFIG_ARCH_VEXPRESS=y
-CONFIG_AEABI=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
diff --git a/target/aarch64/systems/arm-fm b/target/aarch64/systems/arm-fm
deleted file mode 100644
index 5410fb941..000000000
--- a/target/aarch64/systems/arm-fm
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_TARGET_SYSTEM_ARM_FM
-	bool "ARMv8 Foundation Model"
-	depends on ADK_TARGET_LITTLE_ENDIAN
-	select ADK_TARGET_CPU_AARCH_CORTEX_A57
-	select ADK_TARGET_KERNEL_IMAGE
-	select ADK_TARGET_KERNEL_WITH_COMPRESSION
-	select ADK_PACKAGE_BOOT_WRAPPER_AARCH64
-	select ADK_TARGET_WITH_SERIAL
-	select ADK_TARGET_WITH_PCI
-	select ADK_TARGET_WITH_NET
-	select ADK_TARGET_WITH_NETDEVICE
-	select ADK_TARGET_WITH_BLOCK
-	help
-	  Support for ARMv8 Foundation Model (aarch64).
-
diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs
index 86ede0487..d7b7d2015 100644
--- a/target/config/Config.in.rootfs
+++ b/target/config/Config.in.rootfs
@@ -99,7 +99,6 @@ config ADK_TARGET_ROOTFS_NFSROOT
 		   !ADK_TARGET_SIM && \
 	           !ADK_TARGET_VBOX && \
 		   !ADK_TARGET_SYSTEM_ARANYM_M68K && \
-		   !ADK_TARGET_SYSTEM_ARM_FM && \
 		   !ADK_TARGET_SYSTEM_FOXBOARD_LX832 && \
 		   !ADK_TARGET_SYSTEM_LINKSYS_NSLU2 
 	help
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 645a54a6d..b03f058cb 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -351,7 +351,6 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
 				|| ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU \
 				|| ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE \
 				|| ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 \
-				|| ADK_TARGET_SYSTEM_ARM_FM \
 				|| ADK_TARGET_SYSTEM_QEMU_AARCH64
 	default "ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH
 	default "ttySC0" if ADK_TARGET_SYSTEM_SIM_H8300H
diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet
index fe76c29bd..6a5991111 100644
--- a/target/linux/config/Config.in.ethernet
+++ b/target/linux/config/Config.in.ethernet
@@ -203,14 +203,12 @@ config ADK_KERNEL_SMC91X
 	tristate "SMC91X ethernet driver"
 	select ADK_KERNEL_NET_VENDOR_SMSC
 	select ADK_KERNEL_GPIOLIB
-	depends on ADK_TARGET_SYSTEM_ARM_FM || \
-		   ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB || \
+	depends on ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB || \
 		   ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU || \
 		   ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE
 	default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB
 	default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU
 	default y if ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE
-	default y if ADK_TARGET_SYSTEM_ARM_FM
 	default n
 	help
  	  SMC91X ethernet driver