at91: drop boot_params and PLAT_PHYS_OFFSET

select ARM_PATCH_PHYS_VIRT
as with ARM_PATCH_PHYS_VIRT you can patch boot_params at runtime or any recent
bootloader will provide a valid atags pointer in r2

as point out by Russell on AT91 we never use XIP
so se do not need PLAT_PHYS_OFFSET

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Patrice Vilchez <patrice.vilchez@atmel.com>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5fd0be92f70b5e8a2b19917e92af24d74f2c541c..f4b7dfacf2d032b04104f4552d3000a2c5f1ead0 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -295,6 +295,7 @@ config ARCH_AT91
        select ARCH_REQUIRE_GPIOLIB
        select HAVE_CLK
        select CLKDEV_LOOKUP
        select ARCH_REQUIRE_GPIOLIB
        select HAVE_CLK
        select CLKDEV_LOOKUP

+       select ARM_PATCH_PHYS_VIRT if MMU

        help
          This enables support for systems based on the Atmel AT91RM9200,
          AT91SAM9 and AT91CAP9 processors.
        help
          This enables support for systems based on the Atmel AT91RM9200,
          AT91SAM9 and AT91CAP9 processors.

diff --git a/arch/arm/mach-at91/board-1arm.c b/arch/arm/mach-at91/board-1arm.c
index 672bbd85f952d55852b0316e1700aeae3e44e5e9..73372ca868dec45a6b32baa4b34cc92bc74a8613 100644 (file)
--- a/arch/arm/mach-at91/board-1arm.c
+++ b/arch/arm/mach-at91/board-1arm.c
@@ -92,7 +92,6 @@ static void __init onearm_board_init(void)
 
 MACHINE_START(ONEARM, "Ajeco 1ARM single board computer")
        /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
 
 MACHINE_START(ONEARM, "Ajeco 1ARM single board computer")
        /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = onearm_init_early,
        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = onearm_init_early,

diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c
index 00a92a55e9407506750b9227c981689b96640137..a4924de48c36300e0121371ef0435e1ff4a8e43d 100644 (file)
--- a/arch/arm/mach-at91/board-afeb-9260v1.c
+++ b/arch/arm/mach-at91/board-afeb-9260v1.c
@@ -218,7 +218,6 @@ static void __init afeb9260_board_init(void)
 
 MACHINE_START(AFEB9260, "Custom afeb9260 board")
        /* Maintainer: Sergey Lapin <slapin@ossfans.org> */
 
 MACHINE_START(AFEB9260, "Custom afeb9260 board")
        /* Maintainer: Sergey Lapin <slapin@ossfans.org> */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = afeb9260_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = afeb9260_init_early,

diff --git a/arch/arm/mach-at91/board-at572d940hf_ek.c b/arch/arm/mach-at91/board-at572d940hf_ek.c
index a11d7093a1f91062fca406f1a6d3065a824873f0..dfa896d7d5a97ab4c3cc5ed1e602f8774ff072c4 100644 (file)
--- a/arch/arm/mach-at91/board-at572d940hf_ek.c
+++ b/arch/arm/mach-at91/board-at572d940hf_ek.c
@@ -315,7 +315,6 @@ static void __init eb_board_init(void)
 
 MACHINE_START(AT572D940HFEB, "Atmel AT91D940HF-EB")
        /* Maintainer: Atmel <costa.antonior@gmail.com> */
 
 MACHINE_START(AT572D940HFEB, "Atmel AT91D940HF-EB")
        /* Maintainer: Atmel <costa.antonior@gmail.com> */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at572d940hf_map_io,
        .init_early     = eb_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at572d940hf_map_io,
        .init_early     = eb_init_early,

diff --git a/arch/arm/mach-at91/board-cam60.c b/arch/arm/mach-at91/board-cam60.c
index 3025b905bc3063203d57dd7d170c166f10025f74..148fccb9a25a4e9c5d10ec2740bd4e3a48195af0 100644 (file)
--- a/arch/arm/mach-at91/board-cam60.c
+++ b/arch/arm/mach-at91/board-cam60.c
@@ -198,7 +198,6 @@ static void __init cam60_board_init(void)
 
 MACHINE_START(CAM60, "KwikByte CAM60")
        /* Maintainer: KwikByte */
 
 MACHINE_START(CAM60, "KwikByte CAM60")
        /* Maintainer: KwikByte */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = cam60_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = cam60_init_early,

diff --git a/arch/arm/mach-at91/board-cap9adk.c b/arch/arm/mach-at91/board-cap9adk.c
index af90569204a37c15c2f41f895d24e543973ff770..1904fdf87613d9803ffcae12cfd1618111f4aee5 100644 (file)
--- a/arch/arm/mach-at91/board-cap9adk.c
+++ b/arch/arm/mach-at91/board-cap9adk.c
@@ -396,7 +396,6 @@ static void __init cap9adk_board_init(void)
 
 MACHINE_START(AT91CAP9ADK, "Atmel AT91CAP9A-DK")
        /* Maintainer: Stelian Pop <stelian.pop@leadtechdesign.com> */
 
 MACHINE_START(AT91CAP9ADK, "Atmel AT91CAP9A-DK")
        /* Maintainer: Stelian Pop <stelian.pop@leadtechdesign.com> */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91cap9_map_io,
        .init_early     = cap9adk_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91cap9_map_io,
        .init_early     = cap9adk_init_early,

diff --git a/arch/arm/mach-at91/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c
index dfa98f34281d6a4a268ce16d7a2e2ed9ef358867..3929b1172067270d64d0eb617c82ddb1387a8a2f 100644 (file)
--- a/arch/arm/mach-at91/board-carmeva.c
+++ b/arch/arm/mach-at91/board-carmeva.c
@@ -162,7 +162,6 @@ static void __init carmeva_board_init(void)
 
 MACHINE_START(CARMEVA, "Carmeva")
        /* Maintainer: Conitec Datasystems */
 
 MACHINE_START(CARMEVA, "Carmeva")
        /* Maintainer: Conitec Datasystems */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = carmeva_init_early,
        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = carmeva_init_early,

diff --git a/arch/arm/mach-at91/board-cpu9krea.c b/arch/arm/mach-at91/board-cpu9krea.c
index 34fd892edff48137ed75f69c8294ea3c2ab402b4..980511084fe4179e9965568f26cb9a6d174380e9 100644 (file)
--- a/arch/arm/mach-at91/board-cpu9krea.c
+++ b/arch/arm/mach-at91/board-cpu9krea.c
@@ -375,7 +375,6 @@ MACHINE_START(CPUAT9260, "Eukrea CPU9260")
 MACHINE_START(CPUAT9G20, "Eukrea CPU9G20")
 #endif
        /* Maintainer: Eric Benard - EUKREA Electromatique */
 MACHINE_START(CPUAT9G20, "Eukrea CPU9G20")
 #endif
        /* Maintainer: Eric Benard - EUKREA Electromatique */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = cpu9krea_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = cpu9krea_init_early,

diff --git a/arch/arm/mach-at91/board-cpuat91.c b/arch/arm/mach-at91/board-cpuat91.c
index 34c9d0c75e423f4c235ac3c0d286e4f9d05e3d0e..620a36ae79c4ccd005e09afc4e1d1e34d094f2b9 100644 (file)
--- a/arch/arm/mach-at91/board-cpuat91.c
+++ b/arch/arm/mach-at91/board-cpuat91.c
@@ -175,7 +175,6 @@ static void __init cpuat91_board_init(void)
 
 MACHINE_START(CPUAT91, "Eukrea")
        /* Maintainer: Eric Benard - EUKREA Electromatique */
 
 MACHINE_START(CPUAT91, "Eukrea")
        /* Maintainer: Eric Benard - EUKREA Electromatique */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = cpuat91_init_early,
        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = cpuat91_init_early,

diff --git a/arch/arm/mach-at91/board-csb337.c b/arch/arm/mach-at91/board-csb337.c
index a48a32ddb049de275f19f3e057635ac0587c4de2..a7be81e8b9101b56e115f3103d98816306b6e2ed 100644 (file)
--- a/arch/arm/mach-at91/board-csb337.c
+++ b/arch/arm/mach-at91/board-csb337.c
@@ -257,7 +257,6 @@ static void __init csb337_board_init(void)
 
 MACHINE_START(CSB337, "Cogent CSB337")
        /* Maintainer: Bill Gatliff */
 
 MACHINE_START(CSB337, "Cogent CSB337")
        /* Maintainer: Bill Gatliff */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = csb337_init_early,
        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = csb337_init_early,

diff --git a/arch/arm/mach-at91/board-csb637.c b/arch/arm/mach-at91/board-csb637.c
index 7f0ee1cd9e8bffe7f578baa4783f9701781a401e..58a80c368652006f59ec3d237e130f8d8222b3ec 100644 (file)
--- a/arch/arm/mach-at91/board-csb637.c
+++ b/arch/arm/mach-at91/board-csb637.c
@@ -138,7 +138,6 @@ static void __init csb637_board_init(void)
 
 MACHINE_START(CSB637, "Cogent CSB637")
        /* Maintainer: Bill Gatliff */
 
 MACHINE_START(CSB637, "Cogent CSB637")
        /* Maintainer: Bill Gatliff */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = csb637_init_early,
        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = csb637_init_early,

diff --git a/arch/arm/mach-at91/board-eb9200.c b/arch/arm/mach-at91/board-eb9200.c
index 0de1ba43c755b3fa5b9e3bfc18384f1245982465..e9fff803029362faff32537a21af6f81918e5201 100644 (file)
--- a/arch/arm/mach-at91/board-eb9200.c
+++ b/arch/arm/mach-at91/board-eb9200.c
@@ -120,7 +120,6 @@ static void __init eb9200_board_init(void)
 }
 
 MACHINE_START(ATEB9200, "Embest ATEB9200")
 }
 
 MACHINE_START(ATEB9200, "Embest ATEB9200")

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = eb9200_init_early,
        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = eb9200_init_early,

diff --git a/arch/arm/mach-at91/board-ecbat91.c b/arch/arm/mach-at91/board-ecbat91.c
index bd46395aca85fa35a3d6d4ece8e7191469155980..eea65eaf062a180fb6e99de08763e621f26a333f 100644 (file)
--- a/arch/arm/mach-at91/board-ecbat91.c
+++ b/arch/arm/mach-at91/board-ecbat91.c
@@ -168,7 +168,6 @@ static void __init ecb_at91board_init(void)
 
 MACHINE_START(ECBAT91, "emQbit's ECB_AT91")
        /* Maintainer: emQbit.com */
 
 MACHINE_START(ECBAT91, "emQbit's ECB_AT91")
        /* Maintainer: emQbit.com */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = ecb_at91init_early,
        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = ecb_at91init_early,

diff --git a/arch/arm/mach-at91/board-eco920.c b/arch/arm/mach-at91/board-eco920.c
index 6fff26df723eda6bb0f911758c994c2199c1aa31..90a44e5c6391d1fbf93a6ce1a41d33d2fa56457d 100644 (file)
--- a/arch/arm/mach-at91/board-eco920.c
+++ b/arch/arm/mach-at91/board-eco920.c
@@ -129,7 +129,6 @@ static void __init eco920_board_init(void)
 
 MACHINE_START(ECO920, "eco920")
        /* Maintainer: Sascha Hauer */
 
 MACHINE_START(ECO920, "eco920")
        /* Maintainer: Sascha Hauer */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = eco920_init_early,
        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = eco920_init_early,

diff --git a/arch/arm/mach-at91/board-flexibity.c b/arch/arm/mach-at91/board-flexibity.c
index 934542f624b629520f442f72701f653ff8182f2e..466c063b8d218257eae472407a24c5b58773b9b9 100644 (file)
--- a/arch/arm/mach-at91/board-flexibity.c
+++ b/arch/arm/mach-at91/board-flexibity.c
@@ -154,7 +154,6 @@ static void __init flexibity_board_init(void)
 
 MACHINE_START(FLEXIBITY, "Flexibity Connect")
        /* Maintainer: Maxim Osipov */
 
 MACHINE_START(FLEXIBITY, "Flexibity Connect")
        /* Maintainer: Maxim Osipov */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = flexibity_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = flexibity_init_early,

diff --git a/arch/arm/mach-at91/board-foxg20.c b/arch/arm/mach-at91/board-foxg20.c
index 470a66b275ba9eb711d088f17eb2ccf4d3b0df1e..e2d1dc9eff452f09d0459b3191ebaaac387709c0 100644 (file)
--- a/arch/arm/mach-at91/board-foxg20.c
+++ b/arch/arm/mach-at91/board-foxg20.c
@@ -266,7 +266,6 @@ static void __init foxg20_board_init(void)
 
 MACHINE_START(ACMENETUSFOXG20, "Acme Systems srl FOX Board G20")
        /* Maintainer: Sergio Tanzilli */
 
 MACHINE_START(ACMENETUSFOXG20, "Acme Systems srl FOX Board G20")
        /* Maintainer: Sergio Tanzilli */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = foxg20_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = foxg20_init_early,

diff --git a/arch/arm/mach-at91/board-gsia18s.c b/arch/arm/mach-at91/board-gsia18s.c
index 2b409decaae866b1980ee0e7db51add92aefc6af..1d4f36b3cb275d0b27ce83e8a187201efc36402b 100644 (file)
--- a/arch/arm/mach-at91/board-gsia18s.c
+++ b/arch/arm/mach-at91/board-gsia18s.c
@@ -576,7 +576,6 @@ static void __init gsia18s_board_init(void)
 }
 
 MACHINE_START(GSIA18S, "GS_IA18_S")
 }
 
 MACHINE_START(GSIA18S, "GS_IA18_S")

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = gsia18s_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = gsia18s_init_early,

diff --git a/arch/arm/mach-at91/board-kafa.c b/arch/arm/mach-at91/board-kafa.c
index 49557d3be95bf71a61462786282acbef9172fc02..4f17a1c98f2ef01bb550d5373eebac28986c19d4 100644 (file)
--- a/arch/arm/mach-at91/board-kafa.c
+++ b/arch/arm/mach-at91/board-kafa.c
@@ -94,7 +94,6 @@ static void __init kafa_board_init(void)
 
 MACHINE_START(KAFA, "Sperry-Sun KAFA")
        /* Maintainer: Sergei Sharonov */
 
 MACHINE_START(KAFA, "Sperry-Sun KAFA")
        /* Maintainer: Sergei Sharonov */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = kafa_init_early,
        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = kafa_init_early,

diff --git a/arch/arm/mach-at91/board-kb9202.c b/arch/arm/mach-at91/board-kb9202.c
index fca061a7370fcddf1a6a097c2a19885918154d94..39247fae5171ebe4938061ccb65628a826e43404 100644 (file)
--- a/arch/arm/mach-at91/board-kb9202.c
+++ b/arch/arm/mach-at91/board-kb9202.c
@@ -136,7 +136,6 @@ static void __init kb9202_board_init(void)
 
 MACHINE_START(KB9200, "KB920x")
        /* Maintainer: KwikByte, Inc. */
 
 MACHINE_START(KB9200, "KB920x")
        /* Maintainer: KwikByte, Inc. */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = kb9202_init_early,
        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = kb9202_init_early,

diff --git a/arch/arm/mach-at91/board-neocore926.c b/arch/arm/mach-at91/board-neocore926.c
index 004b76da64f5d94cb55646281211386bcfbc1f53..961e805db68c21f7bde7db486d43126e57e31cd5 100644 (file)
--- a/arch/arm/mach-at91/board-neocore926.c
+++ b/arch/arm/mach-at91/board-neocore926.c
@@ -387,7 +387,6 @@ static void __init neocore926_board_init(void)
 
 MACHINE_START(NEOCORE926, "ADENEO NEOCORE 926")
        /* Maintainer: ADENEO */
 
 MACHINE_START(NEOCORE926, "ADENEO NEOCORE 926")
        /* Maintainer: ADENEO */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9263_map_io,
        .init_early     = neocore926_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9263_map_io,
        .init_early     = neocore926_init_early,

diff --git a/arch/arm/mach-at91/board-pcontrol-g20.c b/arch/arm/mach-at91/board-pcontrol-g20.c
index df1ed7e2806b7dbeb3e63781d510293a6c3e6645..21a21af258784336c94a7b374b883a26f6652d82 100644 (file)
--- a/arch/arm/mach-at91/board-pcontrol-g20.c
+++ b/arch/arm/mach-at91/board-pcontrol-g20.c
@@ -222,7 +222,6 @@ static void __init pcontrol_g20_board_init(void)
 
 MACHINE_START(PCONTROL_G20, "PControl G20")
        /* Maintainer: pgsellmann@portner-elektronik.at */
 
 MACHINE_START(PCONTROL_G20, "PControl G20")
        /* Maintainer: pgsellmann@portner-elektronik.at */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = pcontrol_g20_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = pcontrol_g20_init_early,

diff --git a/arch/arm/mach-at91/board-picotux200.c b/arch/arm/mach-at91/board-picotux200.c
index 97372f6925936f47d19a0d26ae5cef773bd6e46b..8294eae1e6648e385605f5f2a88ec2163d871bf7 100644 (file)
--- a/arch/arm/mach-at91/board-picotux200.c
+++ b/arch/arm/mach-at91/board-picotux200.c
@@ -123,7 +123,6 @@ static void __init picotux200_board_init(void)
 
 MACHINE_START(PICOTUX2XX, "picotux 200")
        /* Maintainer: Kleinhenz Elektronik GmbH */
 
 MACHINE_START(PICOTUX2XX, "picotux 200")
        /* Maintainer: Kleinhenz Elektronik GmbH */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = picotux200_init_early,
        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = picotux200_init_early,

diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c
index 5822d8ea4719e4bdec9ddb9a5fd5cd82f0d8f887..d1a6001b0bd86b7a931ff0c8f86e710a85ae67eb 100644 (file)
--- a/arch/arm/mach-at91/board-qil-a9260.c
+++ b/arch/arm/mach-at91/board-qil-a9260.c
@@ -268,7 +268,6 @@ static void __init ek_board_init(void)
 
 MACHINE_START(QIL_A9260, "CALAO QIL_A9260")
        /* Maintainer: calao-systems */
 
 MACHINE_START(QIL_A9260, "CALAO QIL_A9260")
        /* Maintainer: calao-systems */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = ek_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = ek_init_early,

diff --git a/arch/arm/mach-at91/board-rm9200dk.c b/arch/arm/mach-at91/board-rm9200dk.c
index 4f04f284dcb1f94b8065990da438e08be10cd5f3..b90d0f9ade32a7f2736b9f38aea1464c5a0d7ff1 100644 (file)
--- a/arch/arm/mach-at91/board-rm9200dk.c
+++ b/arch/arm/mach-at91/board-rm9200dk.c
@@ -227,7 +227,6 @@ static void __init dk_board_init(void)
 
 MACHINE_START(AT91RM9200DK, "Atmel AT91RM9200-DK")
        /* Maintainer: SAN People/Atmel */
 
 MACHINE_START(AT91RM9200DK, "Atmel AT91RM9200-DK")
        /* Maintainer: SAN People/Atmel */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = dk_init_early,
        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = dk_init_early,

diff --git a/arch/arm/mach-at91/board-rm9200ek.c b/arch/arm/mach-at91/board-rm9200ek.c
index cf161c54ee077b1365a4878d30ed4b9aaad8a64b..51c266807b1e8eef5c5ed62be1118991532db559 100644 (file)
--- a/arch/arm/mach-at91/board-rm9200ek.c
+++ b/arch/arm/mach-at91/board-rm9200ek.c
@@ -193,7 +193,6 @@ static void __init ek_board_init(void)
 
 MACHINE_START(AT91RM9200EK, "Atmel AT91RM9200-EK")
        /* Maintainer: SAN People/Atmel */
 
 MACHINE_START(AT91RM9200EK, "Atmel AT91RM9200-EK")
        /* Maintainer: SAN People/Atmel */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = ek_init_early,
        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = ek_init_early,

diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c
index b925ba99abc2713621faa13c2d6fd504e934de7c..aaf1bf0989b3c1635e40e6314456cd7189594d77 100644 (file)
--- a/arch/arm/mach-at91/board-sam9-l9260.c
+++ b/arch/arm/mach-at91/board-sam9-l9260.c
@@ -212,7 +212,6 @@ static void __init ek_board_init(void)
 
 MACHINE_START(SAM9_L9260, "Olimex SAM9-L9260")
        /* Maintainer: Olimex */
 
 MACHINE_START(SAM9_L9260, "Olimex SAM9-L9260")
        /* Maintainer: Olimex */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = ek_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = ek_init_early,

diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c
index b1a358492d88b0eea73fe4e187abf0ec02d10b0c..d600dc123227f04dad183eb1606f798258eb2ba1 100644 (file)
--- a/arch/arm/mach-at91/board-sam9260ek.c
+++ b/arch/arm/mach-at91/board-sam9260ek.c
@@ -353,7 +353,6 @@ static void __init ek_board_init(void)
 
 MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK")
        /* Maintainer: Atmel */
 
 MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK")
        /* Maintainer: Atmel */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = ek_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = ek_init_early,

diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
index 57d243445b53a762615d4be22a30682a1c10d9e9..f897f84d43dc490d393768c3c9ed6296687e5f44 100644 (file)
--- a/arch/arm/mach-at91/board-sam9261ek.c
+++ b/arch/arm/mach-at91/board-sam9261ek.c
@@ -620,7 +620,6 @@ MACHINE_START(AT91SAM9261EK, "Atmel AT91SAM9261-EK")
 MACHINE_START(AT91SAM9G10EK, "Atmel AT91SAM9G10-EK")
 #endif
        /* Maintainer: Atmel */
 MACHINE_START(AT91SAM9G10EK, "Atmel AT91SAM9G10-EK")
 #endif
        /* Maintainer: Atmel */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9261_map_io,
        .init_early     = ek_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9261_map_io,
        .init_early     = ek_init_early,

diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c
index 232634dc17cf1809e235dbd3e880d4466192cbab..605b26f40a4ce6e947f0a322c2597e88cf3514de 100644 (file)
--- a/arch/arm/mach-at91/board-sam9263ek.c
+++ b/arch/arm/mach-at91/board-sam9263ek.c
@@ -451,7 +451,6 @@ static void __init ek_board_init(void)
 
 MACHINE_START(AT91SAM9263EK, "Atmel AT91SAM9263-EK")
        /* Maintainer: Atmel */
 
 MACHINE_START(AT91SAM9263EK, "Atmel AT91SAM9263-EK")
        /* Maintainer: Atmel */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9263_map_io,
        .init_early     = ek_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9263_map_io,
        .init_early     = ek_init_early,

diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c
index 0a24f3f687c89934825ac1b0b914b107910d0b5a..7624cf0d006b9030639d1a7d2a84d9a3b8f5893a 100644 (file)
--- a/arch/arm/mach-at91/board-sam9g20ek.c
+++ b/arch/arm/mach-at91/board-sam9g20ek.c
@@ -403,7 +403,6 @@ static void __init ek_board_init(void)
 
 MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK")
        /* Maintainer: Atmel */
 
 MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK")
        /* Maintainer: Atmel */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = ek_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = ek_init_early,


@@ -413,7 +412,6 @@ MACHINE_END
 
 MACHINE_START(AT91SAM9G20EK_2MMC, "Atmel AT91SAM9G20-EK 2 MMC Slot Mod")
        /* Maintainer: Atmel */
 
 MACHINE_START(AT91SAM9G20EK_2MMC, "Atmel AT91SAM9G20-EK 2 MMC Slot Mod")
        /* Maintainer: Atmel */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = ek_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = ek_init_early,

diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
index 645c97063c7a6ea4d0b3271f1cd155576f43bf2a..063c95d0e8f02879c35792b548da42452056e183 100644 (file)
--- a/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@ -421,7 +421,6 @@ static void __init ek_board_init(void)
 
 MACHINE_START(AT91SAM9M10G45EK, "Atmel AT91SAM9M10G45-EK")
        /* Maintainer: Atmel */
 
 MACHINE_START(AT91SAM9M10G45EK, "Atmel AT91SAM9M10G45-EK")
        /* Maintainer: Atmel */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9g45_map_io,
        .init_early     = ek_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9g45_map_io,
        .init_early     = ek_init_early,

diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c
index 102f86210607ed6e1635bd93a492ccc8abca3a99..effb399a80a689ce5993e7526715ebb875b0d4a3 100644 (file)
--- a/arch/arm/mach-at91/board-sam9rlek.c
+++ b/arch/arm/mach-at91/board-sam9rlek.c
@@ -329,7 +329,6 @@ static void __init ek_board_init(void)
 
 MACHINE_START(AT91SAM9RLEK, "Atmel AT91SAM9RL-EK")
        /* Maintainer: Atmel */
 
 MACHINE_START(AT91SAM9RLEK, "Atmel AT91SAM9RL-EK")
        /* Maintainer: Atmel */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9rl_map_io,
        .init_early     = ek_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9rl_map_io,
        .init_early     = ek_init_early,

diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c
index ad956286aeabe896f76a3e15d96ab5e3847f5b7b..3eb0a1153cc8f2ee50c5f5e2f6afd1947173de78 100644 (file)
--- a/arch/arm/mach-at91/board-snapper9260.c
+++ b/arch/arm/mach-at91/board-snapper9260.c
@@ -178,7 +178,6 @@ static void __init snapper9260_board_init(void)
 }
 
 MACHINE_START(SNAPPER_9260, "Bluewater Systems Snapper 9260/9G20 module")
 }
 
 MACHINE_START(SNAPPER_9260, "Bluewater Systems Snapper 9260/9G20 module")

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = snapper9260_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = snapper9260_init_early,

diff --git a/arch/arm/mach-at91/board-stamp9g20.c b/arch/arm/mach-at91/board-stamp9g20.c
index 38515e4d1fb5388f9385529a701fd4ea865f7092..5e5c85688f5f5a59ade095ec246952ef4750419e 100644 (file)
--- a/arch/arm/mach-at91/board-stamp9g20.c
+++ b/arch/arm/mach-at91/board-stamp9g20.c
@@ -298,7 +298,6 @@ static void __init stamp9g20evb_board_init(void)
 
 MACHINE_START(PORTUXG20, "taskit PortuxG20")
        /* Maintainer: taskit GmbH */
 
 MACHINE_START(PORTUXG20, "taskit PortuxG20")
        /* Maintainer: taskit GmbH */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = portuxg20_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = portuxg20_init_early,


@@ -308,7 +307,6 @@ MACHINE_END
 
 MACHINE_START(STAMP9G20, "taskit Stamp9G20")
        /* Maintainer: taskit GmbH */
 
 MACHINE_START(STAMP9G20, "taskit Stamp9G20")
        /* Maintainer: taskit GmbH */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = stamp9g20evb_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = stamp9g20evb_init_early,

diff --git a/arch/arm/mach-at91/board-usb-a9260.c b/arch/arm/mach-at91/board-usb-a9260.c
index a0c17d5a64776eae0347754e43f4342f4fb0c7c5..0e784e6fedec3641acf2b2ebf502b4d682fe91dc 100644 (file)
--- a/arch/arm/mach-at91/board-usb-a9260.c
+++ b/arch/arm/mach-at91/board-usb-a9260.c
@@ -228,7 +228,6 @@ static void __init ek_board_init(void)
 
 MACHINE_START(USB_A9260, "CALAO USB_A9260")
        /* Maintainer: calao-systems */
 
 MACHINE_START(USB_A9260, "CALAO USB_A9260")
        /* Maintainer: calao-systems */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = ek_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9260_map_io,
        .init_early     = ek_init_early,

diff --git a/arch/arm/mach-at91/board-usb-a9263.c b/arch/arm/mach-at91/board-usb-a9263.c
index 5356af7e87e2e34baef645ca7e2a09cc49c9cad6..cf626dd14b2ccc6c914790641e523989cfe66413 100644 (file)
--- a/arch/arm/mach-at91/board-usb-a9263.c
+++ b/arch/arm/mach-at91/board-usb-a9263.c
@@ -244,7 +244,6 @@ static void __init ek_board_init(void)
 
 MACHINE_START(USB_A9263, "CALAO USB_A9263")
        /* Maintainer: calao-systems */
 
 MACHINE_START(USB_A9263, "CALAO USB_A9263")
        /* Maintainer: calao-systems */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9263_map_io,
        .init_early     = ek_init_early,
        .timer          = &at91sam926x_timer,
        .map_io         = at91sam9263_map_io,
        .init_early     = ek_init_early,

diff --git a/arch/arm/mach-at91/board-yl-9200.c b/arch/arm/mach-at91/board-yl-9200.c
index 8f9ea5aa6719bc11bc776b120954b194fec2366f..167337ff79c82113dbbadb6d02799c8e8b40129f 100644 (file)
--- a/arch/arm/mach-at91/board-yl-9200.c
+++ b/arch/arm/mach-at91/board-yl-9200.c
@@ -594,7 +594,6 @@ static void __init yl9200_board_init(void)
 
 MACHINE_START(YL9200, "uCdragon YL-9200")
        /* Maintainer: S.Birtles */
 
 MACHINE_START(YL9200, "uCdragon YL-9200")
        /* Maintainer: S.Birtles */

-       .boot_params    = AT91_SDRAM_BASE + 0x100,

        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = yl9200_init_early,
        .timer          = &at91rm9200_timer,
        .map_io         = at91rm9200_map_io,
        .init_early     = yl9200_init_early,

diff --git a/arch/arm/mach-at91/include/mach/at91cap9.h b/arch/arm/mach-at91/include/mach/at91cap9.h
index a043bce8da974652d5912e430b964e2af87d5e88..665993849a7b99f44fc97a8d06578b0578971ecc 100644 (file)
--- a/arch/arm/mach-at91/include/mach/at91cap9.h
+++ b/arch/arm/mach-at91/include/mach/at91cap9.h
@@ -121,6 +121,4 @@
 #define AT91CAP9_UDPHS_FIFO    0x00600000      /* USB High Speed Device Port */
 #define AT91CAP9_UHP_BASE      0x00700000      /* USB Host controller */
 
 #define AT91CAP9_UDPHS_FIFO    0x00600000      /* USB High Speed Device Port */
 #define AT91CAP9_UHP_BASE      0x00700000      /* USB Host controller */
 

-#define CONFIG_DRAM_BASE       AT91_CHIPSELECT_6
-

 #endif
 #endif

diff --git a/arch/arm/mach-at91/include/mach/at91sam9g45.h b/arch/arm/mach-at91/include/mach/at91sam9g45.h
index 520b14b9cfe9a7f3421e8181d8e3966dc18d6944..659304aa73d939176d6197acd548e50370e0e821 100644 (file)
--- a/arch/arm/mach-at91/include/mach/at91sam9g45.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9g45.h
@@ -129,8 +129,6 @@
 #define AT91SAM9G45_EHCI_BASE  0x00800000      /* USB Host controller (EHCI) */
 #define AT91SAM9G45_VDEC_BASE  0x00900000      /* Video Decoder Controller */
 
 #define AT91SAM9G45_EHCI_BASE  0x00800000      /* USB Host controller (EHCI) */
 #define AT91SAM9G45_VDEC_BASE  0x00900000      /* Video Decoder Controller */
 

-#define CONFIG_DRAM_BASE       AT91_CHIPSELECT_6
-

 #define CONSISTENT_DMA_SIZE    SZ_4M
 
 /*
 #define CONSISTENT_DMA_SIZE    SZ_4M
 
 /*

diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h
index 352246407f72845c9916de5d2b0d8b895fdfaef4..469d3af5a5517ce07633162b74334406d6ee2606 100644 (file)
--- a/arch/arm/mach-at91/include/mach/hardware.h
+++ b/arch/arm/mach-at91/include/mach/hardware.h
@@ -88,13 +88,6 @@
 #define AT91_CHIPSELECT_6      0x70000000
 #define AT91_CHIPSELECT_7      0x80000000
 
 #define AT91_CHIPSELECT_6      0x70000000
 #define AT91_CHIPSELECT_7      0x80000000
 

-/* SDRAM */
-#ifdef CONFIG_DRAM_BASE
-#define AT91_SDRAM_BASE                CONFIG_DRAM_BASE
-#else
-#define AT91_SDRAM_BASE                AT91_CHIPSELECT_1
-#endif
-

 /* Clocks */
 #define AT91_SLOW_CLOCK                32768           /* slow clock */
 
 /* Clocks */
 #define AT91_SLOW_CLOCK                32768           /* slow clock */
 

diff --git a/arch/arm/mach-at91/include/mach/memory.h b/arch/arm/mach-at91/include/mach/memory.h
index c2cfe5040642982891cfc6a0ea2d684ab33dd037..401c207f2f39c8e3af445183794d70e14c518e49 100644 (file)
--- a/arch/arm/mach-at91/include/mach/memory.h
+++ b/arch/arm/mach-at91/include/mach/memory.h
@@ -23,6 +23,4 @@
 
 #include <mach/hardware.h>
 
 
 #include <mach/hardware.h>
 

-#define PLAT_PHYS_OFFSET       (AT91_SDRAM_BASE)
-

 #endif
 #endif