IMX: MX31: Cleanup include files and drop nasty #ifdef in drivers

[u-boot] / board / freescale / mx31ads / u-boot.lds

diff --git a/board/freescale/mx31ads/u-boot.lds b/board/freescale/mx31ads/u-boot.lds
index 273129457b227ee95506a38b69fb309fc0fe7aa0..b081b219466dde4aae5ddea8ac52ffad159bf77f 100644 (file)
--- a/board/freescale/mx31ads/u-boot.lds
+++ b/board/freescale/mx31ads/u-boot.lds
@@ -38,10 +38,10 @@ SECTIONS
          /* the sector layout of our flash chips!      XXX FIXME XXX   */
 
          arch/arm/cpu/arm1136/start.o                  (.text)
-         board/freescale/mx31ads/libmx31ads.a  (.text)
-         arch/arm/lib/libarm.a                 (.text)
-         net/libnet.a                          (.text)
-         drivers/mtd/libmtd.a                  (.text)
+         board/freescale/mx31ads/libmx31ads.o  (.text)
+         arch/arm/lib/libarm.o                 (.text)
+         net/libnet.o                          (.text)
+         drivers/mtd/libmtd.o                  (.text)
 
          . = DEFINED(env_offset) ? env_offset : .;
          common/env_embedded.o(.text)
@@ -66,5 +66,5 @@ SECTIONS
        . = ALIGN(4);
        __bss_start = .;
        .bss : { *(.bss) . = ALIGN(4); }
-       _end = .;
+       __bss_end__ = .;
 }