mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
ARM: 7006/1: Migrate to asm-generic wrapper support
With d8ecc5c (kbuild: asm-generic support, 2011-04-27) we can
remove a handful of asm-generic wrappers in ARM code. Since the
generic version of sizes.h doesn't contain SZ_48M, we replace
the 4 users of SZ_48M with the equivalent SZ_32M + SZ_16M.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Cc: Imre Kaloz <kaloz@openwrt.org>
Acked-by: Krzysztof Halasa <khc@pm.waw.pl>
Cc: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Stephen Boyd
Russell King
parent
d0a77454c7
commit
3f8e288033
21 changed files with 22 additions and 73 deletions
|
|
@ -1,3 +1,20 @@
|
|||
include include/asm-generic/Kbuild.asm
|
||||
|
||||
header-y += hwcap.h
|
||||
|
||||
generic-y += auxvec.h
|
||||
generic-y += bitsperlong.h
|
||||
generic-y += cputime.h
|
||||
generic-y += emergency-restart.h
|
||||
generic-y += errno.h
|
||||
generic-y += ioctl.h
|
||||
generic-y += irq_regs.h
|
||||
generic-y += kdebug.h
|
||||
generic-y += local.h
|
||||
generic-y += local64.h
|
||||
generic-y += percpu.h
|
||||
generic-y += poll.h
|
||||
generic-y += resource.h
|
||||
generic-y += sections.h
|
||||
generic-y += siginfo.h
|
||||
generic-y += sizes.h
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
#ifndef __ASMARM_AUXVEC_H
|
||||
#define __ASMARM_AUXVEC_H
|
||||
|
||||
#endif
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include <asm-generic/bitsperlong.h>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
#ifndef __ARM_CPUTIME_H
|
||||
#define __ARM_CPUTIME_H
|
||||
|
||||
#include <asm-generic/cputime.h>
|
||||
|
||||
#endif /* __ARM_CPUTIME_H */
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
#ifndef _ASM_EMERGENCY_RESTART_H
|
||||
#define _ASM_EMERGENCY_RESTART_H
|
||||
|
||||
#include <asm-generic/emergency-restart.h>
|
||||
|
||||
#endif /* _ASM_EMERGENCY_RESTART_H */
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
#ifndef _ARM_ERRNO_H
|
||||
#define _ARM_ERRNO_H
|
||||
|
||||
#include <asm-generic/errno.h>
|
||||
|
||||
#endif
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include <asm-generic/ioctl.h>
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include <asm-generic/irq_regs.h>
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include <asm-generic/kdebug.h>
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include <asm-generic/local.h>
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include <asm-generic/local64.h>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
#ifndef __ARM_PERCPU
|
||||
#define __ARM_PERCPU
|
||||
|
||||
#include <asm-generic/percpu.h>
|
||||
|
||||
#endif
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include <asm-generic/poll.h>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
#ifndef _ARM_RESOURCE_H
|
||||
#define _ARM_RESOURCE_H
|
||||
|
||||
#include <asm-generic/resource.h>
|
||||
|
||||
#endif
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include <asm-generic/sections.h>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
#ifndef _ASMARM_SIGINFO_H
|
||||
#define _ASMARM_SIGINFO_H
|
||||
|
||||
#include <asm-generic/siginfo.h>
|
||||
|
||||
#endif
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
/*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
/* Size definitions
|
||||
* Copyright (C) ARM Limited 1998. All rights reserved.
|
||||
*/
|
||||
#include <asm-generic/sizes.h>
|
||||
|
||||
#define SZ_48M (SZ_32M + SZ_16M)
|
||||
|
|
@ -397,7 +397,8 @@ void __init ixp4xx_pci_preinit(void)
|
|||
local_write_config(PCI_BASE_ADDRESS_0, 4, PHYS_OFFSET);
|
||||
local_write_config(PCI_BASE_ADDRESS_1, 4, PHYS_OFFSET + SZ_16M);
|
||||
local_write_config(PCI_BASE_ADDRESS_2, 4, PHYS_OFFSET + SZ_32M);
|
||||
local_write_config(PCI_BASE_ADDRESS_3, 4, PHYS_OFFSET + SZ_48M);
|
||||
local_write_config(PCI_BASE_ADDRESS_3, 4,
|
||||
PHYS_OFFSET + SZ_32M + SZ_16M);
|
||||
|
||||
/*
|
||||
* Enable CSR window at 64 MiB to allow PCI masters
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ static struct mtd_partition aspenite_nand_partitions[] = {
|
|||
}, {
|
||||
.name = "filesystem",
|
||||
.offset = MTDPART_OFS_APPEND,
|
||||
.size = SZ_48M,
|
||||
.size = SZ_32M + SZ_16M,
|
||||
.mask_flags = 0,
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ static struct mtd_partition ttc_dkb_onenand_partitions[] = {
|
|||
}, {
|
||||
.name = "filesystem",
|
||||
.offset = MTDPART_OFS_APPEND,
|
||||
.size = SZ_48M,
|
||||
.size = SZ_32M + SZ_16M,
|
||||
.mask_flags = 0,
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -540,7 +540,7 @@ static struct mtd_partition saar_onenand_partitions[] = {
|
|||
}, {
|
||||
.name = "filesystem",
|
||||
.offset = MTDPART_OFS_APPEND,
|
||||
.size = SZ_48M,
|
||||
.size = SZ_32M + SZ_16M,
|
||||
.mask_flags = 0,
|
||||
}
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue