summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--board/pn62/cmd_pn62.c2
-rw-r--r--common/Makefile1
-rw-r--r--common/cmd_bootm.c2
-rw-r--r--common/cmd_load.c2
-rw-r--r--common/cmd_net.c2
-rw-r--r--cpu/mpc8260/pci.c2
-rw-r--r--fs/cramfs/uncompress.c2
-rw-r--r--include/configs/MPC8260ADS.h19
-rw-r--r--include/u-boot/zlib.h (renamed from include/zlib.h)0
-rw-r--r--lib_arm/bootm.c2
-rw-r--r--lib_avr32/bootm.c2
-rw-r--r--lib_generic/crc32.c2
-rw-r--r--lib_generic/gunzip.c2
-rw-r--r--lib_generic/zlib.c2
-rw-r--r--lib_i386/bootm.c2
-rwxr-xr-xlib_m68k/bootm.c2
-rw-r--r--lib_microblaze/bootm.c2
-rw-r--r--lib_mips/bootm.c2
-rw-r--r--lib_ppc/bootm.c2
-rw-r--r--tools/.gitignore1
-rw-r--r--tools/Makefile5
-rw-r--r--tools/ncb.c2
22 files changed, 38 insertions, 22 deletions
diff --git a/board/pn62/cmd_pn62.c b/board/pn62/cmd_pn62.c
index b9f3bdb..ff5d63e 100644
--- a/board/pn62/cmd_pn62.c
+++ b/board/pn62/cmd_pn62.c
@@ -157,7 +157,7 @@ int do_loadpci (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
char *s;
if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) {
- printf ("Running "source" command at addr 0x%08lX",
+ printf ("Running \"source\" command at addr 0x%08lX",
load_addr);
s = getenv ("autoscript_uname");
diff --git a/common/Makefile b/common/Makefile
index 0a93462..a42440a 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -52,6 +52,7 @@ COBJS-y += env_common.o
COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o
COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
COBJS-$(CONFIG_ENV_IS_EMBEDDED) += env_embedded.o
+COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_embedded.o
COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
COBJS-$(CONFIG_ENV_IS_IN_MG_DISK) += env_mgdisk.o
COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 6fdeef4..bd1813a 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -30,7 +30,7 @@
#include <command.h>
#include <image.h>
#include <malloc.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
#include <bzlib.h>
#include <environment.h>
#include <lmb.h>
diff --git a/common/cmd_load.c b/common/cmd_load.c
index d5eaac7..2b5a66d 100644
--- a/common/cmd_load.c
+++ b/common/cmd_load.c
@@ -518,7 +518,7 @@ int do_load_serial_bin (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
char *s;
if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) {
- printf ("Running "source" command at addr 0x%08lX",
+ printf ("Running \"source\" command at addr 0x%08lX",
load_addr);
s = getenv ("autoscript_uname");
diff --git a/common/cmd_net.c b/common/cmd_net.c
index 9bef7a2..92bbf85 100644
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -224,7 +224,7 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
#ifdef CONFIG_SOURCE
if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) {
- printf ("Running "source" command at addr 0x%08lX",
+ printf ("Running \"source\" command at addr 0x%08lX",
load_addr);
s = getenv ("autoscript_uname");
diff --git a/cpu/mpc8260/pci.c b/cpu/mpc8260/pci.c
index f1e9bb4..6a14ba4 100644
--- a/cpu/mpc8260/pci.c
+++ b/cpu/mpc8260/pci.c
@@ -258,6 +258,8 @@ void pci_mpc8250_init (struct pci_controller *hose)
immap->im_siu_conf.sc_siumcr =
(immap->im_siu_conf.sc_siumcr & ~SIUMCR_LBPC11)
| SIUMCR_LBPC01;
+#elif defined(CONFIG_ADSTYPE) && CONFIG_ADSTYPE == CONFIG_SYS_PQ2FADS
+/* nothing to do for this board here */
#elif defined CONFIG_MPC8272
immap->im_siu_conf.sc_siumcr = (immap->im_siu_conf.sc_siumcr &
~SIUMCR_BBD &
diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c
index 39dd275..228fe68 100644
--- a/fs/cramfs/uncompress.c
+++ b/fs/cramfs/uncompress.c
@@ -23,7 +23,7 @@
#include <common.h>
#include <malloc.h>
#include <watchdog.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
static z_stream stream;
diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index 42fbe90..d6e4477 100644
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -67,6 +67,13 @@
#if CONFIG_ADSTYPE == CONFIG_SYS_8272ADS
#define CONFIG_MPC8272 1
+#elif CONFIG_ADSTYPE == CONFIG_SYS_PQ2FADS
+/*
+ * Actually MPC8275, but the code is littered with ifdefs that
+ * apply to both, or which use this ifdef to assume board-specific
+ * details. :-(
+ */
+#define CONFIG_MPC8272 1
#else
#define CONFIG_MPC8260 1
#endif /* CONFIG_ADSTYPE == CONFIG_SYS_8272ADS */
@@ -176,7 +183,7 @@
#endif /* CONFIG_ADSTYPE >= CONFIG_SYS_PQ2FADS */
/*PCI*/
-#ifdef CONFIG_MPC8272
+#if CONFIG_ADSTYPE >= CONFIG_SYS_PQ2FADS
#define CONFIG_PCI
#define CONFIG_PCI_PNP
#define CONFIG_PCI_BOOTDELAY 0
@@ -244,7 +251,6 @@
#elif CONFIG_ADSTYPE >= CONFIG_SYS_PQ2FADS
#undef CONFIG_CMD_SDRAM
#undef CONFIG_CMD_I2C
- #undef CONFIG_CMD_PCI
#else
#undef CONFIG_CMD_PCI
@@ -318,7 +324,7 @@
#define CONFIG_SYS_IMMR 0xF0000000
#define CONFIG_SYS_BCSR 0xF4500000
-#if CONFIG_ADSTYPE == CONFIG_SYS_8272ADS
+#if CONFIG_ADSTYPE >= CONFIG_SYS_PQ2FADS
#define CONFIG_SYS_PCI_INT 0xF8200000
#endif
#define CONFIG_SYS_SDRAM_BASE 0x00000000
@@ -413,6 +419,9 @@
#if CONFIG_ADSTYPE == CONFIG_SYS_8272ADS
#define CONFIG_SYS_BR3_PRELIM (CONFIG_SYS_PCI_INT | 0x1801) /* PCI interrupt controller */
#define CONFIG_SYS_OR3_PRELIM 0xFFFF8010
+#elif CONFIG_ADSTYPE == CONFIG_SYS_PQ2FADS
+#define CONFIG_SYS_BR8_PRELIM (CONFIG_SYS_PCI_INT | 0x1801) /* PCI interrupt controller */
+#define CONFIG_SYS_OR8_PRELIM 0xFFFF8010
#endif
#define CONFIG_SYS_RMR RMR_CSRE
@@ -447,7 +456,7 @@
#define CONFIG_SYS_RESET_ADDRESS 0x04400000
-#if CONFIG_ADSTYPE == CONFIG_SYS_8272ADS
+#if CONFIG_ADSTYPE >= CONFIG_SYS_PQ2FADS
/* PCI Memory map (if different from default map */
#define CONFIG_SYS_PCI_SLV_MEM_LOCAL CONFIG_SYS_SDRAM_BASE /* Local base */
@@ -508,6 +517,8 @@
#endif /* CONFIG_ADSTYPE == CONFIG_8272ADS*/
+#define CONFIG_HAS_ETH0
+
#if CONFIG_ADSTYPE == CONFIG_SYS_8272ADS
#define CONFIG_HAS_ETH1
#endif
diff --git a/include/zlib.h b/include/u-boot/zlib.h
index e441494..e441494 100644
--- a/include/zlib.h
+++ b/include/u-boot/zlib.h
diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c
index 7dbde7d..128b7e3 100644
--- a/lib_arm/bootm.c
+++ b/lib_arm/bootm.c
@@ -24,7 +24,7 @@
#include <common.h>
#include <command.h>
#include <image.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
#include <asm/byteorder.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/lib_avr32/bootm.c b/lib_avr32/bootm.c
index 0ca4718..6a3172a 100644
--- a/lib_avr32/bootm.c
+++ b/lib_avr32/bootm.c
@@ -22,7 +22,7 @@
#include <common.h>
#include <command.h>
#include <image.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
#include <asm/byteorder.h>
#include <asm/arch/addrspace.h>
#include <asm/io.h>
diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c
index b6a7a91..3927ce1 100644
--- a/lib_generic/crc32.c
+++ b/lib_generic/crc32.c
@@ -17,7 +17,7 @@
#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
#include <watchdog.h>
#endif
-#include "zlib.h"
+#include "u-boot/zlib.h"
#define local static
#define ZEXPORT /* empty */
diff --git a/lib_generic/gunzip.c b/lib_generic/gunzip.c
index 5bcf5b7..01a4031 100644
--- a/lib_generic/gunzip.c
+++ b/lib_generic/gunzip.c
@@ -26,7 +26,7 @@
#include <command.h>
#include <image.h>
#include <malloc.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
#define ZALLOC_ALIGNMENT 16
#define HEAD_CRC 2
diff --git a/lib_generic/zlib.c b/lib_generic/zlib.c
index 2b01c8f..d1cd44c 100644
--- a/lib_generic/zlib.c
+++ b/lib_generic/zlib.c
@@ -27,7 +27,7 @@
#define _Z_UTIL_H
-#include "zlib.h"
+#include "u-boot/zlib.h"
#ifndef local
# define local static
diff --git a/lib_i386/bootm.c b/lib_i386/bootm.c
index ea19b3d..f96d7bd 100644
--- a/lib_i386/bootm.c
+++ b/lib_i386/bootm.c
@@ -24,7 +24,7 @@
#include <common.h>
#include <command.h>
#include <image.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
#include <asm/byteorder.h>
#include <asm/zimage.h>
diff --git a/lib_m68k/bootm.c b/lib_m68k/bootm.c
index 958c5ce..e5ed6eb 100755
--- a/lib_m68k/bootm.c
+++ b/lib_m68k/bootm.c
@@ -24,7 +24,7 @@
#include <common.h>
#include <command.h>
#include <image.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
#include <bzlib.h>
#include <watchdog.h>
#include <environment.h>
diff --git a/lib_microblaze/bootm.c b/lib_microblaze/bootm.c
index e97aae6..bce4774 100644
--- a/lib_microblaze/bootm.c
+++ b/lib_microblaze/bootm.c
@@ -27,7 +27,7 @@
#include <common.h>
#include <command.h>
#include <image.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
#include <asm/byteorder.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/lib_mips/bootm.c b/lib_mips/bootm.c
index 3db22ea..54af24c 100644
--- a/lib_mips/bootm.c
+++ b/lib_mips/bootm.c
@@ -24,7 +24,7 @@
#include <common.h>
#include <command.h>
#include <image.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
#include <asm/byteorder.h>
#include <asm/addrspace.h>
diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c
index e03d763..0d702bf 100644
--- a/lib_ppc/bootm.c
+++ b/lib_ppc/bootm.c
@@ -29,7 +29,7 @@
#include <command.h>
#include <image.h>
#include <malloc.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
#include <bzlib.h>
#include <environment.h>
#include <asm/byteorder.h>
diff --git a/tools/.gitignore b/tools/.gitignore
index 3a4136b..03f54ef 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -4,6 +4,7 @@
/img2srec
/mkimage
/mpc86x_clk
+/ncb
/ncp
/ubsha1
/inca-swap-bytes
diff --git a/tools/Makefile b/tools/Makefile
index 122e5bb..52f6cc0 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -69,6 +69,7 @@ include $(TOPDIR)/config.mk
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_FLASH) += 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)
@@ -124,7 +125,7 @@ endif
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))
#
@@ -190,7 +191,7 @@ $(obj)bin2header$(SFX): $(obj)bin2header.o
$(STRIP) $@
# Some files complain if compiled with -pedantic, use FIT_CFLAGS
-$(obj)image.o: $(SRCTREE)/tools/image.c
+$(obj)image.o: $(SRCTREE)/common/image.c
$(CC) -g $(FIT_CFLAGS) -c -o $@ $<
$(obj)mkimage.o: $(SRCTREE)/tools/mkimage.c
diff --git a/tools/ncb.c b/tools/ncb.c
index 7e123f1..30acbea 100644
--- a/tools/ncb.c
+++ b/tools/ncb.c
@@ -1,7 +1,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <sys/socket.h>
-#include <linux/in.h>
+#include <netinet/in.h>
int main (int argc, char *argv[])
{
generated by cgit v1.1 at 2024-12-15 13:08:09 +0000