From 1c304f6a5f9aaa9d27625db4fd10bafa20e1fd45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Tue, 5 Feb 2008 16:08:50 +0100 Subject: [PATCH] --- yaml --- r: 91175 b: refs/heads/master c: c1a9e91e426a78728c0e815b0355a7c0374d1088 h: refs/heads/master i: 91173: d72ea561ddd97abb48e282c3a3a57e283c5a7733 91171: 71a1fcc18b0790ac8b2b3ad473ea4140cda88943 91167: ba5942860f59a30e3cb67d36a393af67df0946f0 v: v3 --- [refs] | 2 +- trunk/arch/arm/Makefile | 1 - trunk/arch/arm/mach-ns9xxx/Makefile.boot | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7bf90a7ac466..f0906b04e8c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 210b94e864de9d50ed08603a1ff0834603f309e0 +refs/heads/master: c1a9e91e426a78728c0e815b0355a7c0374d1088 diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile index 1a4649667ec8..9ea97d08a505 100644 --- a/trunk/arch/arm/Makefile +++ b/trunk/arch/arm/Makefile @@ -134,7 +134,6 @@ endif machine-$(CONFIG_ARCH_PNX4008) := pnx4008 machine-$(CONFIG_ARCH_NETX) := netx machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx - textofs-$(CONFIG_ARCH_NS9XXX) := 0x00108000 machine-$(CONFIG_ARCH_DAVINCI) := davinci machine-$(CONFIG_ARCH_KS8695) := ks8695 incdir-$(CONFIG_ARCH_MXC) := mxc diff --git a/trunk/arch/arm/mach-ns9xxx/Makefile.boot b/trunk/arch/arm/mach-ns9xxx/Makefile.boot index 75ed64e90fa4..54654919229b 100644 --- a/trunk/arch/arm/mach-ns9xxx/Makefile.boot +++ b/trunk/arch/arm/mach-ns9xxx/Makefile.boot @@ -1,2 +1,2 @@ -zreladdr-y := 0x108000 +zreladdr-y := 0x8000 params_phys-y := 0x100