Commit 30e54461 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-cleanup-boot-for-v3.11' of... 

Merge tag 'renesas-cleanup-boot-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

From Simon Horman:

Renesas ARM based SoC boot cleanup for v3.11

Work by Magnus Damm and others to clean up the boot of and move
things closer to supporting multi-arch.

As a side effect of this work it was decided to remove support for
two boards, Bonito and AP4EVB. Those patches are included in this
series as they depend on earlier patches in the series.

* tag 'renesas-cleanup-boot-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: Remove Bonito board support
  ARM: shmobile: Remove AP4EVB board support
  ARM: shmobile: Remove mach/memory.h
  ARM: shmobile: Remove MEMORY_START/SIZE
  ARM: shmobile: Enable ARM_PATCH_PHYS_VIRT
  ARM: shmobile: Remove old SCU boot code
  ARM: shmobile: EMEV2 SMP with SCU boot fn and args
  ARM: shmobile: sh73a0 SMP with SCU boot fn and args
  ARM: shmobile: r8a7779 SMP with SCU boot fn and args
  ARM: shmobile: Add SCU boot function using argument
  ARM: shmobile: Add SMP boot function and argument
  ARM: shmobile: Rework sh7372 sleep code to use virt_to_phys()
  ARM: shmobile: Remove romImage CONFIG_MEMORY_START
  ARM: shmobile: Let romImage rely on default ATAGS
  ARM: shmobile: uImage load address rework

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c20e459f 53332005

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -636,6 +636,7 @@ config ARCH_MSM 


config ARCH_SHMOBILE

	bool "Renesas SH-Mobile / R-Mobile"

	select ARM_PATCH_PHYS_VIRT

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select HAVE_ARM_SCU if SMP
@@ -645,7 +646,6 @@ config ARCH_SHMOBILE 
	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	select MULTI_IRQ_HANDLER

	select NEED_MACH_MEMORY_H

	select NO_IOPORT

	select PINCTRL

	select PM_GENERIC_DOMAINS if PM

arch/arm/boot/compressed/head-shmobile.S

+2 −19
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ __image_start: 
__image_end:

	.long	_got_end

__load_base:

	.long	CONFIG_MEMORY_START + 0x02000000 @ Load at 32Mb into SDRAM

	.long	MEMORY_START + 0x02000000 @ Load at 32Mb into SDRAM

__loaded:

	.long	__continue

	.align
@@ -55,26 +55,9 @@ __tmp_stack: 
__continue:

#endif /* CONFIG_ZBOOT_ROM_MMC || CONFIG_ZBOOT_ROM_SH_MOBILE_SDHI */



	b	1f

__atags:@ tag #1

	.long	12			@ tag->hdr.size = tag_size(tag_core);

	.long	0x54410001		@ tag->hdr.tag = ATAG_CORE;

	.long   0			@ tag->u.core.flags = 0;

	.long	0			@ tag->u.core.pagesize = 0;

	.long	0			@ tag->u.core.rootdev = 0;

	@ tag #2

	.long	8			@ tag->hdr.size = tag_size(tag_mem32);

	.long	0x54410002		@ tag->hdr.tag = ATAG_MEM;

	.long	CONFIG_MEMORY_SIZE	@ tag->u.mem.size = CONFIG_MEMORY_SIZE;

	.long	CONFIG_MEMORY_START	@ @ tag->u.mem.start = CONFIG_MEMORY_START;

	@ tag #3

	.long	0			@ tag->hdr.size = 0

	.long	0			@ tag->hdr.tag = ATAG_NONE;

1:



	/* Set board ID necessary for boot */

	ldr	r7, 1f				@ Set machine type register

	adr	r8, __atags			@ Set atag register

	mov	r8, #0				@ pass null pointer as atag

	b	2f



1 :	.long MACH_TYPE

arch/arm/configs/ap4evb_defconfig

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
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/configs/bonito_defconfig

deleted100644 → 0
+0 −72
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16

# CONFIG_UTS_NS is not set

# CONFIG_IPC_NS is not set

# CONFIG_USER_NS is not set

# CONFIG_PID_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=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_R8A7740=y

CONFIG_MACH_BONITO=y

# CONFIG_SH_TIMER_TMU is not set

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_FORCE_MAX_ZONEORDER=12

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttySC5,115200 earlyprintk=sh-sci.5,115200 ignore_loglevel"

CONFIG_KEXEC=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_SUSPEND is not set

CONFIG_PM_RUNTIME=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_MTD=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_ARM_INTEGRATOR=y

CONFIG_MTD_BLOCK2MTD=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

# CONFIG_SCSI_LOWLEVEL is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_SH_SCI=y

CONFIG_SERIAL_SH_SCI_NR_UARTS=9

CONFIG_SERIAL_SH_SCI_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_SH_MOBILE=y

CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

# CONFIG_MFD_SUPPORT is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_UIO=y

CONFIG_UIO_PDRV=y

CONFIG_UIO_PDRV_GENIRQ=y

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY_USER is not set

CONFIG_TMPFS=y

# CONFIG_MISC_FILESYSTEMS is not set

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

# CONFIG_ARM_UNWIND is not set

arch/arm/mach-shmobile/Kconfig

+0 −58
Original line number Diff line number Diff line
@@ -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
@@ -118,12 +97,6 @@ config MACH_KOTA2 
	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



config MACH_BONITO

	bool "bonito board"

	depends on ARCH_R8A7740

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



config MACH_ARMADILLO800EVA

	bool "Armadillo-800 EVA board"

	depends on ARCH_R8A7740
@@ -199,37 +172,6 @@ config CPU_HAS_INTEVT 
        bool

	default y



menu "Memory configuration"



config MEMORY_START

	hex "Physical memory start address"

	default "0x40000000" if MACH_AP4EVB || MACH_AG5EVM || \

				MACH_MACKEREL || MACH_BONITO || \

				MACH_ARMADILLO800EVA || MACH_APE6EVM || \

				MACH_LAGER

	default "0x41000000" if MACH_KOTA2

	default "0x00000000"

	---help---

	  Tweak this only when porting to a new machine which does not

	  already have a defconfig. Changing it from the known correct

	  value on any of the known systems will only lead to disaster.



config MEMORY_SIZE

	hex "Physical memory size"

	default "0x80000000" if MACH_LAGER

	default "0x40000000" if MACH_APE6EVM

	default "0x20000000" if MACH_AG5EVM || MACH_BONITO || \

				MACH_ARMADILLO800EVA

	default "0x1e000000" if MACH_KOTA2

	default "0x10000000" if MACH_AP4EVB || MACH_MACKEREL

	default "0x04000000"

	help

	  This sets the default memory size assumed by your kernel. It can

	  be overridden as normal by the 'mem=' argument on the kernel command

	  line.



endmenu



menu "Timer and clock configuration"



config SHMOBILE_TIMER_HZ

CRA Git | Maintained and supported by SUSTech CRA and CCSE