# multiple symbol definitions are treated as errors, hence the
# -multiply_defined suppress option to turn off this error.
#
-ifeq ($(HOSTOS)-$(HOSTARCH),darwin-ppc)
-HOST_CFLAGS = -traditional-cpp -Wall
-HOST_LDFLAGS =-multiply_defined suppress
-HOST_ENVIRO_CFLAGS =
-else
-ifeq ($(HOSTOS)-$(HOSTARCH),netbsd-ppc)
-HOST_CFLAGS = -Wall -pedantic
+HOST_CFLAGS = -Wall
HOST_LDFLAGS =
-HOST_ENVIRO_CFLAGS =
-#
-# Everyone else
-#
+ifeq ($(HOSTOS)-$(HOSTARCH),darwin-ppc)
+HOST_CFLAGS += -traditional-cpp
+HOST_LDFLAGS += -multiply_defined suppress
else
-HOST_CFLAGS = -Wall -pedantic
-HOST_LDFLAGS =
-HOST_ENVIRO_CFLAGS =
+HOST_CFLAGS += -pedantic
endif
+
+ifeq ($(HOSTOS),cygwin)
+HOST_CFLAGS += -ansi
endif
#
-# Cygwin needs .exe files :-(
+# toolchains targeting win32 generate .exe files
#
-ifeq ($(HOSTOS),cygwin)
+ifneq (,$(findstring WIN32 ,$(shell $(HOSTCC) -E -dM -xc /dev/null)))
SFX = .exe
-HOST_CFLAGS += -ansi
else
SFX =
endif
BIN_FILES-$(CONFIG_CMD_LOADS) += img2srec$(SFX)
BIN_FILES-y += mkimage$(SFX)
BIN_FILES-$(CONFIG_ENV_IS_EMBEDDED) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_EEPROM) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_FLASH) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_NVRAM) += envcrc$(SFX)
BIN_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX)
BIN_FILES-$(CONFIG_CMD_NET) += gen_eth_addr$(SFX)
BIN_FILES-$(CONFIG_LCD_LOGO) += bmp_logo$(SFX)
BIN_FILES-$(CONFIG_INCA_IP) += inca-swap-bytes$(SFX)
BIN_FILES-$(CONFIG_NETCONSOLE) += ncb$(SFX)
-# Source files which are symlinked from elsewhere in U-Boot
-OBJ_LINKS-y += env_embedded.o
-OBJ_LINKS-y += crc32.o md5.o
-OBJ_LINKS-y += sha1.o
-OBJ_LINKS-y += image.o
+# Source files which exist outside the tools directory
+EXT_OBJ_FILES-y += common/env_embedded.o
+EXT_OBJ_FILES-y += lib_generic/crc32.o
+EXT_OBJ_FILES-y += lib_generic/md5.o
+EXT_OBJ_FILES-y += lib_generic/sha1.o
+EXT_OBJ_FILES-y += common/image.o
# Source files located in the tools directory
OBJ_FILES-$(CONFIG_CMD_LOADS) += img2srec.o
OBJ_FILES-$(CONFIG_VIDEO_LOGO) += bmp_logo.o
OBJ_FILES-$(CONFIG_INCA_IP) += inca-swap-bytes.o
OBJ_FILES-$(CONFIG_NETCONSOLE) += ncb.o
+OBJ_FILES-y += os_support.o
# Don't build by default
#ifeq ($(ARCH),ppc)
ifeq ($(VENDOR),atmel)
LOGO_BMP= logos/atmel.bmp
endif
+ifeq ($(VENDOR),ronetix)
+LOGO_BMP= logos/ronetix.bmp
+endif
# now $(obj) is defined
-SRCS := $(addprefix $(obj),$(OBJ_LINKS-y:.o=.c)) $(OBJ_FILES-y:.o=.c)
+SRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c))
+SRCS += $(addprefix $(SRCTREE)/tools/,$(OBJ_FILES-y:.o=.c))
SRCS += $(addprefix $(SRCTREE)/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c))
-BINS := $(addprefix $(obj),$(BIN_FILES-y))
+BINS := $(addprefix $(obj),$(sort $(BIN_FILES-y)))
LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y))
#
# Use native tools and options
+# Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
#
CPPFLAGS = -idirafter $(SRCTREE)/include \
-idirafter $(OBJTREE)/include2 \
-idirafter $(OBJTREE)/include \
-I $(SRCTREE)/libfdt \
-I $(SRCTREE)/tools \
- -DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC
+ -DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC \
+ -D__KERNEL_STRICT_NAMES
CFLAGS = $(HOST_CFLAGS) $(CPPFLAGS) -O
# No -pedantic switch to avoid libfdt compilation warnings
$(obj)envcrc$(SFX): $(obj)envcrc.o $(obj)crc32.o $(obj)env_embedded.o $(obj)sha1.o
$(CC) $(CFLAGS) -o $@ $^
-$(obj)ubsha1$(SFX): $(obj)ubsha1.o $(obj)sha1.o
+$(obj)ubsha1$(SFX): $(obj)ubsha1.o $(obj)sha1.o $(obj)os_support.o
$(CC) $(CFLAGS) -o $@ $^
$(obj)img2srec$(SFX): $(obj)img2srec.o
$(STRIP) $@
$(obj)mkimage$(SFX): $(obj)mkimage.o $(obj)crc32.o $(obj)image.o $(obj)md5.o \
- $(obj)sha1.o $(LIBFDT_OBJS)
+ $(obj)sha1.o $(LIBFDT_OBJS) $(obj)os_support.o
$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
$(STRIP) $@
$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
$(STRIP) $@
-$(obj)envcrc.o: $(src)envcrc.c
- $(CC) -g $(CFLAGS) -c -o $@ $<
-
-$(obj)ubsha1.o: $(src)ubsha1.c
- $(CC) -g $(CFLAGS) -c -o $@ $<
-
-$(obj)crc32.o: $(obj)crc32.c
- $(CC) -g $(CFLAGS) -c -o $@ $<
-
-$(obj)md5.o: $(obj)md5.c
- $(CC) -g $(CFLAGS) -c -o $@ $<
-
-$(obj)sha1.o: $(obj)sha1.c
- $(CC) -g $(CFLAGS) -c -o $@ $<
-
-$(obj)image.o: $(obj)image.c
+# Some files complain if compiled with -pedantic, use FIT_CFLAGS
+$(obj)image.o: $(SRCTREE)/common/image.c
$(CC) -g $(FIT_CFLAGS) -c -o $@ $<
-$(obj)mkimage.o: $(src)mkimage.c
- $(CC) -g $(FIT_CFLAGS) -c -o $@ $<
-
-$(obj)ncb.o: $(src)ncb.c
- $(CC) -g $(CFLAGS) -c -o $@ $<
-
-$(obj)gen_eth_addr.o: $(src)gen_eth_addr.c
- $(CC) -g $(CFLAGS) -c -o $@ $<
-
-$(obj)inca-swap-bytes.o: $(src)inca-swap-bytes.c
- $(CC) -g $(CFLAGS) -c -o $@ $<
-
-$(obj)mpc86x_clk.o: $(src)mpc86x_clk.c
- $(CC) -g $(CFLAGS) -c -o $@ $<
-
-$(obj)fdt.o:
+$(obj)mkimage.o: $(SRCTREE)/tools/mkimage.c
$(CC) -g $(FIT_CFLAGS) -c -o $@ $<
-$(obj)fdt_ro.o:
+$(obj)os_support.o: $(SRCTREE)/tools/os_support.c
$(CC) -g $(FIT_CFLAGS) -c -o $@ $<
-$(obj)fdt_rw.o:
+# Some of the tool objects need to be accessed from outside the tools directory
+$(obj)%.o: $(SRCTREE)/common/%.c
$(CC) -g $(FIT_CFLAGS) -c -o $@ $<
-$(obj)fdt_strerror.o:
- $(CC) -g $(FIT_CFLAGS) -c -o $@ $<
+$(obj)%.o: $(SRCTREE)/lib_generic/%.c
+ $(CC) -g $(CFLAGS) -c -o $@ $<
-$(obj)fdt_wip.o:
+$(LIBFDT_OBJS):
$(CC) -g $(FIT_CFLAGS) -c -o $@ $<
subdirs:
done
endif
-$(obj)env_embedded.c:
- @rm -f $(obj)env_embedded.c
- ln -s $(src)../common/env_embedded.c $(obj)env_embedded.c
-
-$(obj)env_embedded.o: $(obj)env_embedded.c
- $(CC) -g $(HOST_ENVIRO_CFLAGS) $(CPPFLAGS) -c -o $@ $<
-
-$(obj)crc32.c: $(SRCTREE)/include/u-boot/zlib.h
- @rm -f $(obj)crc32.c
- ln -s $(src)../lib_generic/crc32.c $(obj)crc32.c
-
-$(obj)md5.c:
- @rm -f $(obj)md5.c
- ln -s $(src)../lib_generic/md5.c $(obj)md5.c
-
-$(obj)sha1.c:
- @rm -f $(obj)sha1.c
- ln -s $(src)../lib_generic/sha1.c $(obj)sha1.c
-
-$(obj)image.c:
- @rm -f $(obj)image.c
- ln -s $(src)../common/image.c $(obj)image.c
-
$(LOGO_H): $(obj)bmp_logo $(LOGO_BMP)
$(obj)./bmp_logo $(LOGO_BMP) >$@