mirror of
https://github.com/torvalds/linux.git
synced 2024-12-26 04:42:12 +00:00
1fdb24e969
* 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits) ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET ARM: gic, local timers: use the request_percpu_irq() interface ARM: gic: consolidate PPI handling ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H ARM: mach-s5p64x0: remove mach/memory.h ARM: mach-s3c64xx: remove mach/memory.h ARM: plat-mxc: remove mach/memory.h ARM: mach-prima2: remove mach/memory.h ARM: mach-zynq: remove mach/memory.h ARM: mach-bcmring: remove mach/memory.h ARM: mach-davinci: remove mach/memory.h ARM: mach-pxa: remove mach/memory.h ARM: mach-ixp4xx: remove mach/memory.h ARM: mach-h720x: remove mach/memory.h ARM: mach-vt8500: remove mach/memory.h ARM: mach-s5pc100: remove mach/memory.h ARM: mach-tegra: remove mach/memory.h ARM: plat-tcc: remove mach/memory.h ARM: mach-mmp: remove mach/memory.h ARM: mach-cns3xxx: remove mach/memory.h ... Fix up mostly pretty trivial conflicts in: - arch/arm/Kconfig - arch/arm/include/asm/localtimer.h - arch/arm/kernel/Makefile - arch/arm/mach-shmobile/board-ap4evb.c - arch/arm/mach-u300/core.c - arch/arm/mm/dma-mapping.c - arch/arm/mm/proc-v7.S - arch/arm/plat-omap/Kconfig largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP -> CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and addition of NEED_MACH_MEMORY_H next to HAVE_IDE.
66 lines
2.0 KiB
C
66 lines
2.0 KiB
C
/*
|
|
* linux/arch/arm/mach-clps711x/arch-edb7211.c
|
|
*
|
|
* Copyright (C) 2000, 2001 Blue Mug, Inc. All Rights Reserved.
|
|
*
|
|
* 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
|
|
*/
|
|
#include <linux/init.h>
|
|
#include <linux/memblock.h>
|
|
#include <linux/types.h>
|
|
#include <linux/string.h>
|
|
|
|
#include <asm/setup.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
|
|
#include "common.h"
|
|
|
|
extern void edb7211_map_io(void);
|
|
|
|
/* Reserve screen memory region at the start of main system memory. */
|
|
static void __init edb7211_reserve(void)
|
|
{
|
|
memblock_reserve(PHYS_OFFSET, 0x00020000);
|
|
}
|
|
|
|
static void __init
|
|
fixup_edb7211(struct tag *tags, char **cmdline, struct meminfo *mi)
|
|
{
|
|
/*
|
|
* Bank start addresses are not present in the information
|
|
* passed in from the boot loader. We could potentially
|
|
* detect them, but instead we hard-code them.
|
|
*
|
|
* Banks sizes _are_ present in the param block, but we're
|
|
* not using that information yet.
|
|
*/
|
|
mi->bank[0].start = 0xc0000000;
|
|
mi->bank[0].size = 8*1024*1024;
|
|
mi->bank[1].start = 0xc1000000;
|
|
mi->bank[1].size = 8*1024*1024;
|
|
mi->nr_banks = 2;
|
|
}
|
|
|
|
MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
|
|
/* Maintainer: Jon McClintock */
|
|
.atag_offset = 0x20100, /* 0xc0000000 - 0xc001ffff can be video RAM */
|
|
.fixup = fixup_edb7211,
|
|
.map_io = edb7211_map_io,
|
|
.reserve = edb7211_reserve,
|
|
.init_irq = clps711x_init_irq,
|
|
.timer = &clps711x_timer,
|
|
MACHINE_END
|