Skip to contentSkip to conversation

at91: remove lowlevel_init.S

PATCH New Jean-Christophe PLAGNIOL-VILLARD 2 participants 5 messages May 1, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 at91: remove lowlevel_init.S

actually no boards use the default lowlevel_init.S so remove it

btw the u-boot.lds is not anymore need to be generated

---
 Makefile                                        |    1 -
 cpu/arm926ejs/at91/.gitignore                   |    5 ---
 cpu/arm926ejs/at91/Makefile                     |    6 +---
 cpu/arm926ejs/at91/config.mk                    |    2 +-
 cpu/arm926ejs/at91/lowlevel_init.S              |   45 -----------------------
 cpu/arm926ejs/at91/{u-boot.lds.S => u-boot.lds} |    5 ---
 6 files changed, 2 insertions(+), 62 deletions(-)
 delete mode 100644 cpu/arm926ejs/at91/.gitignore
 delete mode 100644 cpu/arm926ejs/at91/lowlevel_init.S
 rename cpu/arm926ejs/at91/{u-boot.lds.S => u-boot.lds} (93%)
Makefile +0 -1
index c52894c..8a0784c 100644
@@ -3523,7 +3523,6 @@ clean:
 	       $(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds  \
 	       $(obj)board/bf5{18f,26,27,33,38f,48,61}-ez{brd,kit}/u-boot.lds \
 	       $(obj)board/bf5{33,37}-stamp/u-boot.lds			  \
-	       $(obj)cpu/arm926ejs/at91/u-boot.lds			  \
 	       $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
 	@rm -f $(obj)include/bmp_logo.h
 	@rm -f $(obj)nand_spl/{u-boot-spl,u-boot-spl.map,System.map}
cpu/arm926ejs/at91/.gitignore deleted +0 -5
deleted file mode 100644
index 8a8c3b8..0000000
@@ -1,5 +0,0 @@
-#
-# Generated files
-#
-
-/u-boot.lds
cpu/arm926ejs/at91/Makefile +1 -5
index fbc82d1..e300d97 100644
@@ -58,19 +58,15 @@ COBJS-$(CONFIG_AT91_LED)	+= led.o
 COBJS-y += clock.o
 COBJS-y += cpu.o
 COBJS-y	+= timer.o
-SOBJS	= lowlevel_init.o
 
 SRCS    := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
 OBJS    := $(addprefix $(obj),$(SOBJS) $(COBJS-y))
 
-all:	$(obj).depend $(LIB) $(obj)u-boot.lds
+all:	$(obj).depend $(LIB)
 
 $(LIB):	$(OBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS)
 
-$(obj)u-boot.lds: u-boot.lds.S
-	$(CPP) $(CPPFLAGS) -D__ASSEMBLY__ -DCONFIG_BOARDDIR=$(BOARDDIR) -P $^ > $@
-
 #########################################################################
 
 # defines $(obj).depend target
cpu/arm926ejs/at91/config.mk +1 -1
index 147bd4c..06177e6 100644
@@ -1,2 +1,2 @@
 PLATFORM_CPPFLAGS += $(call cc-option,-mtune=arm926ejs,)
-LDSCRIPT := $(OBJTREE)/cpu/arm926ejs/at91/u-boot.lds
+LDSCRIPT := $(SRCTREE)/cpu/arm926ejs/at91/u-boot.lds
cpu/arm926ejs/at91/lowlevel_init.S deleted +0 -45

45 lines not on this page · raw message

cpu/arm926ejs/at91/u-boot.lds renamed from cpu/arm926ejs/at91/u-boot.lds.S +0 -5
similarity index 93%
rename from cpu/arm926ejs/at91/u-boot.lds.S
rename to cpu/arm926ejs/at91/u-boot.lds
index 4e82bca..62a3e95 100644
@@ -21,8 +21,6 @@
  * MA 02111-1307 USA
  */
 
-#include <config.h>
-
 OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
 /*OUTPUT_FORMAT("elf32-arm", "elf32-arm", "elf32-arm")*/
 OUTPUT_ARCH(arm)
@@ -35,9 +33,6 @@ SECTIONS
 	.text :
 	{
 		cpu/arm926ejs/start.o	(.text)
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT
-		board/CONFIG_BOARDDIR/lowlevel_init.o (.text)
-#endif
 		*(.text)
 	}
 
Signature · 1 line
1.6.1.3
#1 lore raw

PATCH 1/1 at91: remove lowlevel_init.S

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 6 lines · In message <[email protected]> you wrote:

actually no boards use the default lowlevel_init.S so remove it

btw the u-boot.lds is not anymore need to be generated

I understand this patch is supposed to fix the bug introduced by commit f0a2c7b4b64eacd0?

You should note this in the message.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
There are no data that cannot be plotted on a straight  line  if  the
axis are chosen correctly.
#2 lore raw

PATCH 1/1 at91: remove lowlevel_init.S

Quoted 6 lines · Wolfgang Denk

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 3 lines · In message <[email protected]> you wrote:

actually no boards use the default lowlevel_init.S so remove it

Quoted 6 lines
Quoted 3 lines

btw the u-boot.lds is not anymore need to be generated

I understand this patch is supposed to fix the bug introduced by commit f0a2c7b4b64eacd0?

at the same time but it's a side effect

I just notice that noone use the default lowlevel_init.S

which force the norflash boot to add an entry in the lds to force the weak function overwrite so I fix this

Best Regards,
J.

#3 lore raw

PATCH 1/1 at91: remove lowlevel_init.S

In reply to Jean-Christophe PLAGNIOL-VILLARD

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 6 lines · In message <[email protected]> you wrote:

actually no boards use the default lowlevel_init.S so remove it

btw the u-boot.lds is not anymore need to be generated

Quoted 11 lines
---
 Makefile                                        |    1 -
 cpu/arm926ejs/at91/.gitignore                   |    5 ---
 cpu/arm926ejs/at91/Makefile                     |    6 +---
 cpu/arm926ejs/at91/config.mk                    |    2 +-
 cpu/arm926ejs/at91/lowlevel_init.S              |   45 -----------------------
 cpu/arm926ejs/at91/{u-boot.lds.S => u-boot.lds} |    5 ---
 6 files changed, 2 insertions(+), 62 deletions(-)
 delete mode 100644 cpu/arm926ejs/at91/.gitignore
 delete mode 100644 cpu/arm926ejs/at91/lowlevel_init.S
 rename cpu/arm926ejs/at91/{u-boot.lds.S => u-boot.lds} (93%)

This patch may be fixing the out-of-tree build problem introduced with commit f0a2c7b4 "at91: add support for the PM9263 board", but it causes a LOT of new issues:

Configuring for integratorap board...
Variant:: Core module CM720T with core arm720t
In file included from /work/wd/tmp-arm/include2/asm/hardware.h:16,

                 from start.S:29:

/work/wd/tmp-arm/include2/asm/arch/hardware.h:48:2: error: #error "Unsupported AT91 processor" In file included from /work/wd/tmp-arm/include2/asm/hardware.h:16,
from interrupts.c:32:
/work/wd/tmp-arm/include2/asm/arch/hardware.h:48:2: error: #error "Unsupported AT91 processor" In file included from /work/wd/tmp-arm/include2/asm/hardware.h:16,

                 from cpu.c:36:
/work/wd/tmp-arm/include2/asm/arch/hardware.h:48:2: error: #error "Unsupported AT91 processor"
In file included from /work/wd/tmp-arm/include2/asm/hardware.h:16,
                 from start.S:29:

/work/wd/tmp-arm/include2/asm/arch/hardware.h:48:2: error: #error "Unsupported AT91 processor" make[1]: *** [/work/wd/tmp-arm/cpu/arm720t/start.o] Error 1
make: *** [/work/wd/tmp-arm/cpu/arm720t/start.o] Error 2
make: *** Waiting for unfinished jobs....
arm-linux-size: '/work/wd/tmp-arm/u-boot': No such file
Configuring for armadillo board...
In file included from /work/wd/tmp-arm/include2/asm/hardware.h:16,

                 from start.S:29:

/work/wd/tmp-arm/include2/asm/arch/hardware.h:48:2: error: #error "Unsupported AT91 processor" In file included from /work/wd/tmp-arm/include2/asm/hardware.h:16,
from interrupts.c:32:
/work/wd/tmp-arm/include2/asm/arch/hardware.h:48:2: error: #error "Unsupported AT91 processor" In file included from /work/wd/tmp-arm/include2/asm/hardware.h:16,

                 from cpu.c:36:
/work/wd/tmp-arm/include2/asm/arch/hardware.h:48:2: error: #error "Unsupported AT91 processor"
In file included from /work/wd/tmp-arm/include2/asm/hardware.h:16,
                 from start.S:29:

/work/wd/tmp-arm/include2/asm/arch/hardware.h:48:2: error: #error "Unsupported AT91 processor" make[1]: *** [/work/wd/tmp-arm/cpu/arm720t/start.o] Error 1
make: *** [/work/wd/tmp-arm/cpu/arm720t/start.o] Error 2
make: *** Waiting for unfinished jobs....
arm-linux-size: '/work/wd/tmp-arm/u-boot': No such file
Configuring for B2 board...
In file included from /work/wd/tmp-arm/include2/asm/hardware.h:16,

                 from cache.c:29:
/work/wd/tmp-arm/include2/asm/arch/hardware.h:48:2: error: #error "Unsupported AT91 processor"
In file included from /work/wd/tmp-arm/include2/asm/hardware.h:16,
                 from B2.c:28:
/work/wd/tmp-arm/include2/asm/arch/hardware.h:48:2: error: #error "Unsupported AT91 processor"
In file included from /work/wd/tmp-arm/include2/asm/hardware.h:16,
                 from cpu.c:33:
/work/wd/tmp-arm/include2/asm/arch/hardware.h:48:2: error: #error "Unsupported AT91 processor"
In file included from /work/wd/tmp-arm/include2/asm/hardware.h:16,
                 from flash.c:25:

/work/wd/tmp-arm/include2/asm/arch/hardware.h:48:2: error: #error "Unsupported AT91 processor" In file included from /work/wd/tmp-arm/include2/asm/hardware.h:16,
from interrupts.c:28:
/work/wd/tmp-arm/include2/asm/arch/hardware.h:48:2: error: #error "Unsupported AT91 processor" In file included from /work/wd/tmp-arm/include2/asm/hardware.h:16,

                 from cache.c:29:

/work/wd/tmp-arm/include2/asm/arch/hardware.h:48:2: error: #error "Unsupported AT91 processor"

and so on and on and on...

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A Puritan is someone who is deathly afraid that  someone,  somewhere,
is having fun.
#4 lore raw

PATCH 1/1 at91: remove lowlevel_init.S

Dear Jean-Christophe,

Quoted 24 lines · in message <[email protected]> I wrote:
Quoted 6 lines · In message <[email protected]> you wrote:

actually no boards use the default lowlevel_init.S so remove it

btw the u-boot.lds is not anymore need to be generated

Quoted 11 lines
---
 Makefile                                        |    1 -
 cpu/arm926ejs/at91/.gitignore                   |    5 ---
 cpu/arm926ejs/at91/Makefile                     |    6 +---
 cpu/arm926ejs/at91/config.mk                    |    2 +-
 cpu/arm926ejs/at91/lowlevel_init.S              |   45 -----------------------
 cpu/arm926ejs/at91/{u-boot.lds.S => u-boot.lds} |    5 ---
 6 files changed, 2 insertions(+), 62 deletions(-)
 delete mode 100644 cpu/arm926ejs/at91/.gitignore
 delete mode 100644 cpu/arm926ejs/at91/lowlevel_init.S
 rename cpu/arm926ejs/at91/{u-boot.lds.S => u-boot.lds} (93%)

This patch may be fixing the out-of-tree build problem introduced with commit f0a2c7b4 "at91: add support for the PM9263 board", but it causes a LOT of new issues:

Quoted 6 lines

Configuring for integratorap board...
Variant:: Core module CM720T with core arm720t
In file included from /work/wd/tmp-arm/include2/asm/hardware.h:16,

                 from start.S:29:

/work/wd/tmp-arm/include2/asm/arch/hardware.h:48:2: error: #error "Unsupported AT91 processor" In file included from /work/wd/tmp-arm/include2/asm/hardware.h:16,

...

Sorry, this is actually yet another bug.

Ouch. ARM tree is in a TERRIBLE state.

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
No user-servicable parts inside. Refer to qualified service personnel.