Make SC3 board build with 'make O='; use 'addcons' consistently

(SC3 and Jupiter used to use 'addcon' instead).

Signed-off-by: Wolfgang Denk wd@denx.de

diff --git a/board/sc3/Makefile b/board/sc3/Makefile
index 1b0b15fc6262ca8588536372400c0117e8e40877..4cc2b4171ca2c5a382a7756a8e67225a2c1c76cb 100644 (file)
--- a/board/sc3/Makefile
+++ b/board/sc3/Makefile
@@ -23,13 +23,17 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    = lib$(BOARD).a
+LIB    = $(obj)lib$(BOARD).a
 
-OBJS   = $(BOARD).o sc3nand.o
+COBJS  = $(BOARD).o sc3nand.o
 SOBJS  = init.o
 
+SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS))
+SOBJS  := $(addprefix $(obj),$(SOBJS))
+
 $(LIB):        $(OBJS) $(SOBJS)
-       $(AR) crv $@ $^
+       $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
 
 clean:
        rm -f $(SOBJS) $(OBJS)
@@ -39,9 +43,9 @@ distclean:    clean
 
 #########################################################################
 
-.depend:       Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c)
-               $(CC) -M $(CFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
 
-sinclude .depend
+sinclude $(obj).depend
 
 #########################################################################

diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index 64dbd9b9f9eaa9d9ba4dccd5c165bf40b9aa8463..5b97526fc49496559bd6466c75a859051fd6add0 100644 (file)
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -116,14 +116,14 @@
        "addip=setenv bootargs ${bootargs} "                            \
                "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
                ":${hostname}:${netdev}:off panic=1\0"                  \
-       "flash_nfs=run nfsargs addip addcon;"                           \
+       "flash_nfs=run nfsargs addip addcons;"                          \
                "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
                "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
-       "addcon=setenv bootargs ${bootargs} console=${contyp},"         \
+       "addcons=setenv bootargs ${bootargs} console=${contyp},"        \
                "${baudrate}\0"                                         \
        "contyp=ttyS0\0"                                                \
-       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addcon;"     \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addcons;"    \
                "bootm\0"                                               \
        "rootpath=/opt/eldk/ppc_6xx\0"                                  \
        "bootfile=/tftpboot/jupiter/uImage\0"                           \

diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index f2f059863d825f0264dec8e7237ac3befc737599..8298084f1ea9ac3a05d5b4ee8c779550760e2594 100644 (file)
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -113,10 +113,13 @@
        "addip=setenv bootargs ${bootargs} "                            \
                "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
                ":${hostname}:${netdev}:off panic=1\0"                  \
-       "flash_nfs=run nfsargs addip;"                                  \
+       "addcons=setenv bootargs ${bootargs} "                          \
+               "console=ttyS0,${baudrate}\0"                           \
+       "flash_nfs=run nfsargs addip addcons;"                          \
                "bootm ${kernel_addr}\0"                                \
-       "flash_nand=run nand_args addip addcon;bootm ${kernel_addr}\0"  \
-       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
+       "flash_nand=run nand_args addip addcons;bootm ${kernel_addr}\0" \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addcons;"    \
+               "bootm\0"                                               \
        "rootpath=/opt/eldk/ppc_4xx\0"                                  \
        "bootfile=/tftpboot/sc3/uImage\0"                               \
        "u-boot=/tftpboot/sc3/u-boot.bin\0"                             \