ARM: shmobile: Remove AP4EVB board support
Magnus Damm
maintainerPATCH 1/1 ARM: shmobile: Remove AP4EVB board support
From: Magnus Damm <[email protected]>
Remove board support for the sh7372 based AP4EVB board
The sh7372 SoC support code is still kept around since it is in use by the Mackerel board which is basically a more recent board where the design is based on AP4EVB.
Signed-off-by Magnus Damm <[email protected]>
---
Written on top of renesas.git renesas-next-20130611v2 with various patches and series on top including:
[PATCH 00/03] ARM: shmobile: Remove legacy memory bits [PATCH 00/06] ARM: shmobile: SMP virt_to_phys() conversion [PATCH] ARM: shmobile: Rework sh7372 sleep code to use virt_to_phys() [PATCH v2] ARM: shmobile: uImage load address rework [PATCH 00/02] ARM: shmobile: romImage update
arch/arm/configs/ap4evb_defconfig | 56 arch/arm/mach-shmobile/Kconfig | 21 arch/arm/mach-shmobile/Makefile | 1 arch/arm/mach-shmobile/Makefile.boot | 1 arch/arm/mach-shmobile/board-ap4evb.c | 1310 ------------------- arch/arm/mach-shmobile/include/mach/head-ap4evb.txt | 93 - arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h | 29 arch/arm/mach-shmobile/include/mach/mmc.h | 4 arch/arm/mach-shmobile/include/mach/zboot.h | 6 9 files changed, 2 insertions(+), 1519 deletions(-)
arch/arm/configs/ap4evb_defconfig deleted +0 -56
@@ -1,56 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_SHMOBILE=y -CONFIG_ARCH_SH7372=y -CONFIG_MACH_AP4EVB=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=sh-sci.0,115200" -CONFIG_KEXEC=y -CONFIG_PM=y -# CONFIG_SUSPEND is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_NAND=y -# CONFIG_BLK_DEV is not set -# CONFIG_MISC_DEVICES is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_SH_SCI=y -CONFIG_SERIAL_SH_SCI_NR_UARTS=8 -CONFIG_SERIAL_SH_SCI_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -# CONFIG_DNOTIFY is not set -CONFIG_TMPFS=y -# CONFIG_MISC_FILESYSTEMS is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DETECT_SOFTLOCKUP is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_FTRACE is not set -# CONFIG_CRC32 is not set
arch/arm/mach-shmobile/Kconfig +0 -21
@@ -71,27 +71,6 @@ config ARCH_EMEV2 comment "SH-Mobile Board Type" -config MACH_AP4EVB - bool "AP4EVB board" - depends on ARCH_SH7372 - select ARCH_REQUIRE_GPIOLIB - select REGULATOR_FIXED_VOLTAGE if REGULATOR - select SH_LCD_MIPI_DSI - select SND_SOC_AK4642 if SND_SIMPLE_CARD - -choice - prompt "AP4EVB LCD panel selection" - default AP4EVB_QHD - depends on MACH_AP4EVB - -config AP4EVB_QHD - bool "MIPI-DSI QHD (960x540)" - -config AP4EVB_WVGA - bool "Parallel WVGA (800x480)" - -endchoice - config MACH_AG5EVM bool "AG5EVM board" depends on ARCH_SH73A0
arch/arm/mach-shmobile/Makefile +0 -1
@@ -35,7 +35,6 @@ obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779 obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o # Board objects -obj-$(CONFIG_MACH_AP4EVB) += board-ap4evb.o obj-$(CONFIG_MACH_AG5EVM) += board-ag5evm.o obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o
arch/arm/mach-shmobile/Makefile.boot +0 -1
@@ -1,7 +1,6 @@ # per-board load address for uImage loadaddr-y := loadaddr-$(CONFIG_MACH_AG5EVM) += 0x40008000 -loadaddr-$(CONFIG_MACH_AP4EVB) += 0x40008000 loadaddr-$(CONFIG_MACH_APE6EVM) += 0x40008000 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000
arch/arm/mach-shmobile/board-ap4evb.c deleted +0 -1310
1,310 lines not on this page · raw message
arch/arm/mach-shmobile/include/mach/head-ap4evb.txt deleted +0 -93
93 lines not on this page · raw message
arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h deleted +0 -29
@@ -1,29 +0,0 @@ -#ifndef MMC_AP4EB_H -#define MMC_AP4EB_H - -#define PORT185CR (void __iomem *)0xe60520b9 -#define PORT186CR (void __iomem *)0xe60520ba -#define PORT187CR (void __iomem *)0xe60520bb -#define PORT188CR (void __iomem *)0xe60520bc - -#define PORTR191_160DR (void __iomem *)0xe6056014 - -static inline void mmc_init_progress (void ) -{ -/* Initialise LEDS1-4 -* registers: PORT185CR-PORT188CR (LED1-LED4 Control) -* value: 0x10 - enable output -*/ -__raw_writeb (0x10 ,PORT185CR ); -__raw_writeb (0x10 ,PORT186CR ); -__raw_writeb (0x10 ,PORT187CR ); -__raw_writeb (0x10 ,PORT188CR ); -} - -static inline void mmc_update_progress (int n) -{ -__raw_writel ((__raw_readl (PORTR191_160DR ) & ~(0xf <<25 )) | - (1 << (25 + n)),PORTR191_160DR ); -} - -#endif /* MMC_AP4EB_H */
arch/arm/mach-shmobile/include/mach/mmc.h +1 -3
@@ -7,9 +7,7 @@* **************************************************/ -#ifdef CONFIG_MACH_AP4EVB -#include "mach/mmc-ap4eb.h" -#elif defined(CONFIG_MACH_MACKEREL ) +#ifdef CONFIG_MACH_MACKEREL #include "mach/mmc-mackerel.h" #else #error "unsupported board."
arch/arm/mach-shmobile/include/mach/zboot.h +1 -5
@@ -10,11 +10,7 @@* **************************************************/ -#ifdef CONFIG_MACH_AP4EVB -#define MACH_TYPE MACH_TYPE_AP4EVB -#define MEMORY_START 0x40000000 -#include "mach/head-ap4evb.txt" -#elif defined(CONFIG_MACH_MACKEREL ) +#ifdef CONFIG_MACH_MACKEREL #define MACH_TYPE MACH_TYPE_MACKEREL#define MEMORY_START 0x40000000#include "mach/head-mackerel.txt"
PATCH 1/1 ARM: shmobile: Remove AP4EVB board support
Quoted 9 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Remove board support for the sh7372 based AP4EVB board
The sh7372 SoC support code is still kept around since it is in use by the Mackerel board which is basically a more recent board where the design is based on AP4EVB.
Signed-off-by Magnus Damm <[email protected]>
Thanks, I have queued this up in the (new) cleanup-boot branch along with all its dependencies.