Merge branch 'tx28-devel' into karo-devel

diff --git a/board/karo/tx28/Kconfig b/board/karo/tx28/Kconfig
index f1dd7bbc4d245778bd73e05d2a45ba8c3c134f05..c09dea740e3c1fad716d12dec596f1fd195a1ac9 100644 (file)
--- a/board/karo/tx28/Kconfig
+++ b/board/karo/tx28/Kconfig
@@ -22,6 +22,7 @@ config TX28
        select APBH_DMA_BURST8
        select CC_OPTIMIZE_LIBS_FOR_SPEED
        select CMD_NAND_TRIMFFS if CMD_NAND
+       select CMD_ROMUPDATE
        select FDT_FIXUP_PARTITIONS
        select GET_FEC_MAC_ADDR_FROM_IIM if FEC_MXC
        select LIB_RAND

diff --git a/configs/tx28-40x1_defconfig b/configs/tx28-40x1_defconfig
index 451f207ef43709d100fd5b2662788ad975e66c4d..d7d24e5796a934ae602f18784001aeba9e4f4fbe 100644 (file)
--- a/configs/tx28-40x1_defconfig
+++ b/configs/tx28-40x1_defconfig
@@ -20,7 +20,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
-CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y

diff --git a/configs/tx28-40x1_noenv_defconfig b/configs/tx28-40x1_noenv_defconfig
index f2686500525cc7b62f258006e2fc0d28e71398c6..d82c1e6d00ceee2838314336ea2d5cde712540c7 100644 (file)
--- a/configs/tx28-40x1_noenv_defconfig
+++ b/configs/tx28-40x1_noenv_defconfig
@@ -19,7 +19,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
-CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y

diff --git a/configs/tx28-40x2_defconfig b/configs/tx28-40x2_defconfig
index b82bfd9507ba7b5cd8afc5d7c296cbda14f44d95..d0dd8e4e8fb030ec22a13791b93229106911cae3 100644 (file)
--- a/configs/tx28-40x2_defconfig
+++ b/configs/tx28-40x2_defconfig
@@ -20,7 +20,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
-CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y

diff --git a/configs/tx28-40x2_noenv_defconfig b/configs/tx28-40x2_noenv_defconfig
index deef2c9356f5ea6407fcdd51c3b29aad37b0f730..ad8aa74aafe4ba9e96fca9c04dece572127a0a3c 100644 (file)
--- a/configs/tx28-40x2_noenv_defconfig
+++ b/configs/tx28-40x2_noenv_defconfig
@@ -19,7 +19,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
-CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y

diff --git a/configs/tx28-40x3_defconfig b/configs/tx28-40x3_defconfig
index da4e1324bd24f181cdc23e627bd5faa93d93281a..c2eb455f150233a54f548420cfaba63fa8895192 100644 (file)
--- a/configs/tx28-40x3_defconfig
+++ b/configs/tx28-40x3_defconfig
@@ -20,7 +20,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
-CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y

diff --git a/configs/tx28-40x3_noenv_defconfig b/configs/tx28-40x3_noenv_defconfig
index d4c293a975e32151c24e72bb78b383f3d32d9071..220eda958d38e2780d6a16fb1e2fa86cad5fc834 100644 (file)
--- a/configs/tx28-40x3_noenv_defconfig
+++ b/configs/tx28-40x3_noenv_defconfig
@@ -19,7 +19,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
-CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y

diff --git a/configs/tx28-41x0_defconfig b/configs/tx28-41x0_defconfig
index 118a6e0de565acebc92bfc071850b287bcf24f9d..75e5944e048d9e0980269fca0b4aedee29b93e5d 100644 (file)
--- a/configs/tx28-41x0_defconfig
+++ b/configs/tx28-41x0_defconfig
@@ -20,7 +20,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
-CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y

diff --git a/configs/tx28-41x0_noenv_defconfig b/configs/tx28-41x0_noenv_defconfig
index 3dc07657d15dcbe8c99e4c214729c2108df5d819..7d03d96995a509ff85520b90f9be45f6a564ded2 100644 (file)
--- a/configs/tx28-41x0_noenv_defconfig
+++ b/configs/tx28-41x0_noenv_defconfig
@@ -19,7 +19,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
-CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y

diff --git a/tools/elftosb/makefile.rules b/tools/elftosb/makefile.rules
index e3e009da2a4a4ce2a427d781fe8aedd6e401acb2..3fe2730b880ffc96034b7582be64000a287af8b7 100644 (file)
--- a/tools/elftosb/makefile.rules
+++ b/tools/elftosb/makefile.rules
@@ -15,6 +15,8 @@
 # UNAMES is going to be set to either "Linux" or "CYGWIN_NT-5.1"
 UNAMES = $(shell uname -s)
 
+CXX ?= g++
+
 #*******************************************************************************
 #                               Directories
 
@@ -22,93 +24,93 @@ UNAMES = $(shell uname -s)
 #                               Paths
 
 # search path for source files. make finds them automatically.
-VPATH = \
-       ${SRC_DIR}/common       \
-       ${SRC_DIR}/elftosb2 \
-       ${SRC_DIR}/sbtool       \
+VPATH =                                                \
+       ${SRC_DIR}/common                       \
+       ${SRC_DIR}/elftosb2                     \
+       ${SRC_DIR}/sbtool                       \
        ${SRC_DIR}/keygen
 
 # include directories
-INC_PATH =                      \
-    -I${SRC_DIR}/elftosb2        \
-    -I${SRC_DIR}/keygen   \
-    -I${SRC_DIR}/sbtool      \
-       -I${SRC_DIR}/common
+INC_PATH =                                     \
+    -I${SRC_DIR}/elftosb2                      \
+    -I${SRC_DIR}/keygen                                \
+    -I${SRC_DIR}/sbtool                                \
+    -I${SRC_DIR}/common
 
 #*******************************************************************************
 #                               Build flags
-# gcc Compiler flags
+# Compiler flags
 #    -g                                                : Produce debugging information.
 
-CFLAGS     = -g $(INC_PATH) -D${UNAMES}
+CXXFLAGS       = -g $(INC_PATH) -D${UNAMES}
 
 #*******************************************************************************
 #                               File lists
 
-OBJ_FILES_COMMON =                     \
-       AESKey.o        \
-       Blob.o  \
-       crc.o   \
-       DataSource.o    \
-       DataTarget.o    \
-       ELFSourceFile.o \
-       EncoreBootImage.o       \
-       EvalContext.o   \
-       GHSSecInfo.o    \
-       GlobMatcher.o   \
-       HexValues.o \
-       Logging.o       \
-       Operation.o \
-       OptionDictionary.o      \
-       options.o       \
-       OutputSection.o \
-       Random.o        \
-       RijndaelCBCMAC.o        \
-       rijndael.o      \
-       SHA1.o  \
-       SourceFile.o    \
-       SRecordSourceFile.o \
-       stdafx.o        \
-       StELFFile.o \
-       StExecutableImage.o \
-       StSRecordFile.o \
-       Value.o \
-       Version.o \
-       format_string.o \
-       ExcludesListMatcher.o \
-       SearchPath.o    \
-       DataSourceImager.o \
+OBJ_FILES_COMMON =                             \
+       AESKey.o                                \
+       Blob.o                                  \
+       crc.o                                   \
+       DataSource.o                            \
+       DataTarget.o                            \
+       ELFSourceFile.o                         \
+       EncoreBootImage.o                       \
+       EvalContext.o                           \
+       GHSSecInfo.o                            \
+       GlobMatcher.o                           \
+       HexValues.o                             \
+       Logging.o                               \
+       Operation.o                             \
+       OptionDictionary.o                      \
+       options.o                               \
+       OutputSection.o                         \
+       Random.o                                \
+       RijndaelCBCMAC.o                        \
+       rijndael.o                              \
+       SHA1.o                                  \
+       SourceFile.o                            \
+       SRecordSourceFile.o                     \
+       stdafx.o                                \
+       StELFFile.o                             \
+       StExecutableImage.o                     \
+       StSRecordFile.o                         \
+       Value.o                                 \
+       Version.o                               \
+       format_string.o                         \
+       ExcludesListMatcher.o                   \
+       SearchPath.o                            \
+       DataSourceImager.o                      \
        IVTDataSource.o
 
-OBJ_FILES_ELFTOSB2 =           \
-       ${OBJ_FILES_COMMON} \
-       BootImageGenerator.o    \
-       ConversionController.o  \
-       ElftosbAST.o    \
-       elftosb.o       \
-       elftosb_lexer.o \
-       ElftosbLexer.o  \
-       elftosb_parser.tab.o    \
+OBJ_FILES_ELFTOSB2 =                           \
+       ${OBJ_FILES_COMMON}                     \
+       BootImageGenerator.o                    \
+       ConversionController.o                  \
+       ElftosbAST.o                            \
+       elftosb.o                               \
+       elftosb_lexer.o                         \
+       ElftosbLexer.o                          \
+       elftosb_parser.tab.o                    \
        EncoreBootImageGenerator.o
 
-OBJ_FILES_SBTOOL =                     \
-       ${OBJ_FILES_COMMON} \
-       EncoreBootImageReader.o \
+OBJ_FILES_SBTOOL =                             \
+       ${OBJ_FILES_COMMON}                     \
+       EncoreBootImageReader.o                 \
        sbtool.o
 
-OBJ_FILES_KEYGEN =                     \
-       ${OBJ_FILES_COMMON} \
+OBJ_FILES_KEYGEN =                             \
+       ${OBJ_FILES_COMMON}                     \
        keygen.o
 
 
-LIBS =     -lstdc++
+LIBS = -lstdc++
 
 
 ifeq ("${UNAMES}", "Linux")
 EXEC_FILE_ELFTOSB2 = elftosb
 EXEC_FILE_SBTOOL = sbtool
 EXEC_FILE_KEYGEN = keygen
-else 
+else
 ifeq ("${UNAMES}", "CYGWIN_NT-5.1")
 EXEC_FILE_ELFTOSB2 = elftosb.exe
 EXEC_FILE_SBTOOL = sbtool.exe
@@ -137,13 +139,13 @@ clean:
                ${EXEC_FILE_ELFTOSB2} ${EXEC_FILE_SBTOOL} ${EXEC_FILE_KEYGEN}
 
 elftosb: ${OBJ_FILES_ELFTOSB2}
-       gcc ${OBJ_FILES_ELFTOSB2} ${LIBS} -o ${EXEC_FILE_ELFTOSB2}
+       $(CXX) ${OBJ_FILES_ELFTOSB2} ${LIBS} -o ${EXEC_FILE_ELFTOSB2}
 
 sbtool: ${OBJ_FILES_SBTOOL}
-       gcc ${OBJ_FILES_SBTOOL} ${LIBS} -o ${EXEC_FILE_SBTOOL}
+       $(CXX) ${OBJ_FILES_SBTOOL} ${LIBS} -o ${EXEC_FILE_SBTOOL}
 
 keygen: ${OBJ_FILES_KEYGEN}
-       gcc ${OBJ_FILES_KEYGEN} ${LIBS} -o ${EXEC_FILE_KEYGEN}
+       $(CXX) ${OBJ_FILES_KEYGEN} ${LIBS} -o ${EXEC_FILE_KEYGEN}
 
 
 #ifeq ("${UNAMES}", "Linux")
@@ -152,10 +154,10 @@ keygen: ${OBJ_FILES_KEYGEN}
 .SUFFIXES : .c .cpp .o .h
 
 .c.o:
-       gcc ${CFLAGS} -c $<
+       $(CC) ${CXXFLAGS} -c $<
 
 .cpp.o:
-       gcc ${CFLAGS} -c $<
+       $(CXX) ${CXXFLAGS} -c $<
 
 #endif
 
@@ -164,13 +166,13 @@ keygen: ${OBJ_FILES_KEYGEN}
 
 %.d: %.c
        @set -e; \
-       $(CC) -MM $(CFLAGS) $< | \
+       $(CC) -MM $(CXXFLAGS) $< | \
        sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@; \
        [ -s $@ ]  || rm -f $@
 
 %.d: %.cpp
        @set -e; \
-       $(CC) -MM $(CFLAGS) $< | \
+       $(CC) -MM $(CXXFLAGS) $< | \
        sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@; \
        [ -s $@ ]  || rm -f $@