Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b5da2df authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Nicolas Pitre
Browse files

ARM: mach-s3c2410: remove memory.h 



This also removes the mach/s3c2400 version which was probably never used
due to the fact that we have this line in arch/arm/Makefile:

machine-$(CONFIG_ARCH_S3C2410)          := s3c2410 s3c2400 [...]

This is later used to construct the search path for:

The compiler would be looking into mach-s3c2410 and picking up this
version first.  Any config that was actually expecting the mach-s3c2400
version was therefore producing a broken kernel binary.  Not relying on
any of them anymore would fix that issue.

Signed-off-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
parent 8cfc1ef9

arch/arm/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -711,6 +711,7 @@ config ARCH_S3C2410 
	select CLKDEV_LOOKUP

	select CLKDEV_LOOKUP

	select ARCH_USES_GETTIMEOFFSET

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_I2C if I2C

	select NO_MACH_MEMORY_H

	help

	help

	  Samsung S3C2410X CPU based systems, such as the Simtec Electronics

	  Samsung S3C2410X CPU based systems, such as the Simtec Electronics

	  BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or

	  BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or

arch/arm/mach-s3c2400/include/mach/memory.h

deleted100644 → 0
+0 −20
Original line number Original line Diff line number Diff line 
/* arch/arm/mach-s3c2400/include/mach/memory.h

 *  from arch/arm/mach-rpc/include/mach/memory.h

 *

 *  Copyright 2007 Simtec Electronics

 *	http://armlinux.simtec.co.uk/

 *	Ben Dooks <ben@simtec.co.uk>

 *

 *  Copyright (C) 1996,1997,1998 Russell King.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



#ifndef __ASM_ARCH_MEMORY_H

#define __ASM_ARCH_MEMORY_H



#define PLAT_PHYS_OFFSET	UL(0x0C000000)



#endif

arch/arm/mach-s3c2410/include/mach/memory.h

deleted100644 → 0
+0 −16
Original line number Original line Diff line number Diff line 
/* arch/arm/mach-s3c2410/include/mach/memory.h

 *  from arch/arm/mach-rpc/include/mach/memory.h

 *

 *  Copyright (C) 1996,1997,1998 Russell King.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



#ifndef __ASM_ARCH_MEMORY_H

#define __ASM_ARCH_MEMORY_H



#define PLAT_PHYS_OFFSET	UL(0x30000000)



#endif