From 067a5fbdfbe4de906e3a8d4244a4a141b7ef7fe9 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 14 Apr 2017 16:31:45 +0200
Subject: remove arm foundation model sample, bit rotted. better use qemu
 sample for aarch64

---
 target/aarch64/Makefile                | 15 ---------------
 target/aarch64/kernel/arm-fm           |  5 -----
 target/aarch64/systems/arm-fm          | 15 ---------------
 target/config/Config.in.rootfs         |  1 -
 target/config/Config.in.runtime        |  1 -
 target/linux/config/Config.in.ethernet |  4 +---
 6 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 target/aarch64/kernel/arm-fm
 delete mode 100644 target/aarch64/systems/arm-fm

(limited to 'target')

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
-- 
cgit v1.2.3