diff options
| -rw-r--r-- | CHANGELOG | 411 | ||||
| -rwxr-xr-x | MAKEALL | 1 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | config.mk | 46 | ||||
| -rw-r--r-- | cpu/mcf5227x/config.mk | 2 | ||||
| -rw-r--r-- | cpu/mcf523x/config.mk | 2 | ||||
| -rw-r--r-- | cpu/mcf52x2/config.mk | 2 | ||||
| -rw-r--r-- | cpu/mcf532x/config.mk | 2 | ||||
| -rw-r--r-- | cpu/mcf5445x/config.mk | 2 | ||||
| -rw-r--r-- | cpu/mcf547x_8x/config.mk | 2 | ||||
| -rw-r--r-- | include/configs/kb9202.h | 5 | ||||
| -rw-r--r-- | post/board/lwmon5/sysmon.c | 2 |
12 files changed, 449 insertions, 30 deletions
diff --git a/CHANGELOG b/CHANGELOG index 9f70e932b86..5d21db1b2db 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,414 @@ +commit 7c0773fde6100b61be2558cb5d8c442a3194aecb +Author: Wolfgang Denk <wd@denx.de> +Date: Sun May 4 00:35:15 2008 +0200 + + drivers/net/tsec.c: Fix typo. + + Signed-off-by: Wolfgang Denk <wd@denx.de> + +commit aa737945e6f37a5de5dbad550a7694e0cb2a8120 +Author: Mike Frysinger <vapier@gentoo.org> +Date: Fri May 2 21:45:12 2008 -0400 + + version_autogenerated.h: use printf rather than echo -n + + Some systems are dumb and do not implement the -n flag to echo (like OS X). + Convert the Makefile to use printf as this should work everywhere. + + Signed-off-by: Mike Frysinger <vapier@gentoo.org> + Signed-off-by: Wolfgang Denk <wd@denx.de> + +commit 4acc2a108ad0a669165924704a6cb083f9138242 +Author: Mike Frysinger <vapier@gentoo.org> +Date: Fri May 2 18:17:50 2008 -0400 + + fix building when saveenv is disabled in some setups + + If you enable environment in the flash, but disable the embedded + option, and you disable the saveenv command, then the #if nested + logic will trigger a compile failure: + env_flash.c: In function 'env_relocate_spec': + env_flash.c:399: error: 'flash_addr' undeclared (first use in this function) + The fix is to add CMD_SAVEENV ifdef protection like everywhere else. + + Signed-off-by: Mike Frysinger <vapier@gentoo.org> + +commit ccf1ad535ae1c0dc2d466235c668adbdfe3a55b7 +Author: Jeremy McNicoll <jeremy.mcnicoll@windriver.com> +Date: Fri May 2 16:10:04 2008 -0400 + + SBC8548: fix address mask to allow 64M flash + + Fix incorrect mask to enable all 64MB of onboard flash. + Previously U-Boot incorrectly mapped only 8MB of flash, this + patch correctly maps all the available flash. + + Signed-off-by: Jeremy McNicoll <jeremy.mcnicoll@windriver.com> + +commit 3648085c464c8c22ef76fab006ca4344d3796124 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Fri May 2 19:48:56 2008 +0200 + + qemu_mips: add README + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 6fdd002689190a0022c7b3dbab37fcba724580ce +Author: Marcel Ziswiler <marcel@ziswiler.com> +Date: Fri May 2 02:35:59 2008 +0200 + + Fix misspelled comment + + Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com> + +commit fa956fde60b7ec4dd66bd62f9910fd341b5049a1 +Author: Mike Frysinger <vapier@gentoo.org> +Date: Thu May 1 04:13:05 2008 -0400 + + mkimage: make mmap() checks consistent + + The mmap() related code is full of inconsistent casts/constants when + it comes to error checking, and may break when building on some + systems (like ones that do not implicitly define the caddr_t type). + Let's just avoid the whole mess by writing the code nice and clean in + the first place. + + Signed-off-by: Mike Frysinger <vapier@gentoo.org> + +commit 8e90cd0447a0f0ccf529ef86f0e6b56187d3b82a +Author: Marcel Ziswiler <marcel@ziswiler.com> +Date: Thu May 1 09:05:34 2008 +0200 + + Fix defined but not used build warning + + - warning: 'srom' defined but not used + + Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com> + +commit b71190f3250aaffcc81c35f6cfd3498cb7c48013 +Author: Marcel Ziswiler <marcel@ziswiler.com> +Date: Thu May 1 09:05:26 2008 +0200 + + Fix implicit declaration build warnings + + - warning: implicit declaration of function ‘serial_initialize’ + + Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com> + +commit 9acde129cc3f9c1b3bc11a821480dd446774d618 +Author: Andre Schwarz <andre.schwarz@matrix-vision.de> +Date: Tue Apr 29 19:18:32 2008 +0200 + + TSEC: add config options for VSC8601 RGMII PHY + + The Vitesse VSC8601 RGMII PHY has internal delay for both Rx + and Tx clock lines. They are configured using 2 bits in extended + register 0x17. + Therefore CFG_VSC8601_SKEW_TX and CFG_VSC8601_SKEW_RX have + been introduced with valid values 0-3 giving 0.0, 1.4,1.7 and 2.0ns delay. + + Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de> + Acked-by: Andy Fleming <afleming@freescale.com> + Acked-by: Ben Warren <biggerbadderben@gmail.com> + -- + + drivers/net/tsec.c | 6 ++++++ + drivers/net/tsec.h | 3 +++ + 2 files changed, 9 insertions(+), 0 deletions(-) + +commit bd98ee60df43ee6dd6f5ebe32c67d03e90513ff8 +Author: Wolfgang Denk <wd@denx.de> +Date: Sat May 3 23:07:15 2008 +0200 + + Revert "ColdFire: Get information from the correct GCC" + + This reverts commit b7166e05a513c0806b63b9dfb6f1d77645cede2a + (replaced by commit c4e5f52a58d278eebb87f476e353972c5dacea40). + +commit c4e5f52a58d278eebb87f476e353972c5dacea40 +Author: Wolfgang Denk <wd@denx.de> +Date: Sat May 3 22:25:00 2008 +0200 + + config.mk: use correct (cross) compiler + + Some config.mk files reference $(CC) to test for specific tool chain + features, so make sure $(CC) gets set before including any such + config files. + + This patch replaces commit b7166e05a5 ("ColdFire: Get information from + the correct GCC"). + + Signed-off-by: Wolfgang Denk <wd@denx.de> + +commit 27c38689d0cfde0e444239345f97b5eecc9f4067 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Thu May 1 02:13:44 2008 +0200 + + pxa: fix previous definition on cpu init + + start.S:183:1: warning: "ICMR" redefined + In file included from start.S:33: + include/asm/arch/pxa-regs.h:935:1: warning: this is the location of the previous definition + start.S:187:1: warning: "RCSR" redefined + ... + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 6d12e697de794d700767f22f950e3026ccf4daf6 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Thu May 1 02:13:43 2008 +0200 + + pxa: fix pcmcia operation on 'i' may be undefined + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + Signed-off-by: Wolfgang Denk <wd@denx.de> + +commit 4d77f5102dfeaa36cd58d9a9f083bd2cc491526f +Author: Kumar Gala <galak@kernel.crashing.org> +Date: Wed Apr 30 16:24:35 2008 -0500 + + MPC8610HPCD: Drop -O2 from the build flags + + Make the flags use -Os like all other boards + + Signed-off-by: Kumar Gala <galak@kernel.crashing.org> + +commit 0072b78be2b41e5a0ca3ddc39335574dc2e855bd +Author: Stefan Roese <sr@denx.de> +Date: Wed Apr 30 15:50:39 2008 +0200 + + RTC: Fix month offset by one problem in M41T62 RTC driver + + This patch fixes a problem with the month being read and written + incorrectly (offset by one). This only gets visible by also using + the Linux driver (rtc-m41t80). + + Tested on AMCC Canyonlands. + + Signed-off-by: Stefan Roese <sr@denx.de> + +commit 141ba1cad8e6598a2466e7e2976c6a12285df619 +Author: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp> +Date: Sat May 3 13:51:44 2008 +0900 + + [MIPS] cpu/mips/config.mk: Fix GNU assembler minor version picker + + Current trick to pick up GNU assembler minor version uses a dot(.) as a + delimiter, and take the second field to obtain minor version number. But + as can be expected, this doesn't work with a version string which has + dots more than needs. + + Here's an example: + + $ mips-linux-gnu-as --version | grep 'GNU assembler' + GNU assembler (Sourcery G++ Lite 4.2-129) 2.18.50.20080215 + $ mips-linux-gnu-as --version | grep 'GNU assembler' | cut -d. -f2 + 2-129) 2 + $ + + This patch restricts the version format to 2.XX.XX... This will work + in most cases. + + $ mips-linux-gnu-as --version | grep 'GNU assembler' | egrep -o '2\.[0-9\.]+' + 2.18.50.20080215 + $ mips-linux-gnu-as --version | grep 'GNU assembler' | egrep -o '2\.[0-9\.]+' | cut -d. -f2 + 18 + $ + + Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp> + +commit ea638951acead7f1086c908c0b9f086beab82a22 +Author: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp> +Date: Sat May 3 13:51:28 2008 +0900 + + [MIPS] cpu/mips/cache.S: Add dcache_enable + + Recent bootelf command fixes (017e9b7925f74878d0e9475388cca9bda5ef9482, + "allow ports to override bootelf behavior") requires ports to have this + function. + + Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp> + Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit d2c6fbec4397c936b18cd42482b6973cd6781bdf +Author: Wolfgang Denk <wd@denx.de> +Date: Thu May 1 21:30:16 2008 +0200 + + onenand: rename 16 bit memory copy into memcpy_16() to avoid conflicts + + Onenand needs a version of memcpy() which performs 16 bit accesses + only; make sure the name does not conflict with the standard + function. + + Signed-off-by: Wolfgang Denk <wd@denx.de> + +commit 12bc4e94251c369c529ffa505cf58b148c372f7f +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Apr 30 22:38:17 2008 +0200 + + cmd_nand: fix warning: str2long ncompatible pointer type + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 1b9ed2574a38c93cb03dad41885fc06be4bfc9dd +Author: Timur Tabi <timur@freescale.com> +Date: Fri Apr 4 11:16:11 2008 -0500 + + Fix calculation of I2C clock for some 86xx chips + + Some 86xx chips use CCB as the base clock for the I2C, and others used CCB/2. + There is no pattern that can be used to determine which chips use which + frequency, so the only way to determine is to look up the actual SOC + designation and use the right value for that SOC. + + Signed-off-by: Timur Tabi <timur@freescale.com> + +commit f32f7fe7bd3a5bda3a476520f00e1aca7c2103a9 +Author: TsiChung Liew <Tsi-Chung.Liew@freescale.com> +Date: Wed Apr 30 12:11:19 2008 -0500 + + ColdFire: Fix ethernet hang issue for mcf547x_8x + + The ethernet hang is caused by receiving buffer in DRAM is not + yet ready due to access cycles require longer time in DRAM. + Relocate DMA buffer descriptors from DRAM to internal SRAM. + + Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com> + +commit 886d90176fc257e0ab4d0db05d11d0749bbed3ca +Author: TsiChung Liew <Tsi-Chung.Liew@freescale.com> +Date: Wed Apr 30 12:10:47 2008 -0500 + + ColdFire: Fix compilation issue caused by new changes in fsl_i2c.c + + Signed-off-by: Luigi Comio Mantellini <luigi.mantellini@idf-hit.com> + Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com> + +commit b7166e05a513c0806b63b9dfb6f1d77645cede2a +Author: TsiChung Liew <Tsi-Chung.Liew@freescale.com> +Date: Wed Apr 30 12:10:23 2008 -0500 + + ColdFire: Get information from the correct GCC + + Signed-off-by: Kurt Mahan <kmahan@freescale.com> + Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com> + +commit 378e7ec95da4751ec8fe461baacab2bf7d2512a9 +Author: dirk.behme@googlemail.com <dirk.behme@googlemail.com> +Date: Wed Apr 30 18:02:59 2008 +0200 + + Fix warning in env_nand.c if compiled for DaVinci Schmoogie + + Fix warnings + + nv_nand.c: In function 'saveenv': + env_nand.c:200: warning: passing argument 3 of 'nand_write' from incompatible pointer type + env_nand.c: In function 'env_relocate_spec': + env_nand.c:275: warning: passing argument 3 of 'nand_read' from incompatible pointer type + + if compiled for davinci_schmoogie_config. + + Signed-off-by: Dirk Behme <dirk.behme@gmail.com> + Ack by: Sergey Kubushyn <ksi@koi8.net> + +commit 33a4a70d48d622cc4950c60a84fec23b9421f23e +Author: Anatolij Gustschin <agust@denx.de> +Date: Wed Apr 30 13:34:40 2008 +0200 + + Fix warnings while compiling net/net.c for MPC8610HPCD board + + MPC8610HPCD board adds -O2 gcc option to PLATFORM_CPPFLAGS + causing overriding default -Os option. New gcc (ver. 4.2.2) + produces warnings while compiling net/net.c file with -O2 + option. The patch is an attempt to fix this. + + Signed-off-by: Anatolij Gustschin <agust@denx.de> + +commit 58b575e575c25fdf8c88141e145db201f3092149 +Author: Sascha Laue <Sascha.Laue@gmx.biz> +Date: Wed Apr 30 15:23:38 2008 +0200 + + lwmon5: fix offset error in sysmon0 POST + + Signed-off-by: Sascha Laue <sascha.laue@liebherr.com> + Signed-off-by: Wolfgang Denk <wd@denx.de> + +commit e7419b243a373de4ee042f7d4f45f66de787240d +Author: Sascha Laue <Sascha.Laue@gmx.biz> +Date: Wed Apr 30 15:16:35 2008 +0200 + + lwmon5: fix manual merge error in POST + + Signed-off-by: Sascha Laue <sascha.laue@liebherr.com> + +commit 42ffcec3f9eba010a662d5b42981812b6bebfb9a +Author: Wolfgang Denk <wd@denx.de> +Date: Wed Apr 30 17:46:26 2008 +0200 + + cmd_nand.c: fix another 'incompatible pointer type' warning. + + Signed-off-by: Wolfgang Denk <wd@denx.de> + +commit de109d909707e2dfe806be5efc3cdb103b47c8ad +Author: Wolfgang Denk <wd@denx.de> +Date: Wed Apr 30 17:25:07 2008 +0200 + + Makefile: fix parallel builds + + This problem shows up with parallel builds only; it results in + somewhat cryptic error messages like + + $ JOBS=-j6 MAKEALL netstar + Configuring for netstar board... + arm-linux-ld: cannot find -lgeneric + make[1]: *** [eeprom.srec] Error 1 + + A few boards (like netstar and voiceblue) need some libraries for + building; however, the board Makefile does not contain any such + dependencies which may cause problems with parallel builds. Adding + such dependencies is difficult as we would also have to provide build + rules, which already exist in the respective library Makefiles. + + To solve this, we make sure that all libraries get built before the + board code. + + Signed-off-by: Wolfgang Denk <wd@denx.de> + +commit 4f27098e5b0736989b13cd61d7bca94b3574cf5f +Author: Stefan Roese <sr@denx.de> +Date: Wed Apr 30 14:51:36 2008 +0200 + + ppc4xx: Adapt Canyonlands fixed DDR2 setup to new DIMM module + + This patch changes the Canyonlands/Glacier fixed DDR2 controller setup + used for NAND booting to match the values needed for the new 512MB + DIMM modules shipped with the productions boards: + + Crucial: CT6464AC667.8FB + + Signed-off-by: Stefan Roese <sr@denx.de> + +commit ea9202a659dc75996facf1475f1866a19a9d3129 +Author: Stefan Roese <sr@denx.de> +Date: Wed Apr 30 10:49:43 2008 +0200 + + ppc4xx: Fix problem with DIMMs with 8 banks in 44x_spd_ddr2.c + + This patch fixes a problem with DIMMs that have 8 banks. Now the + MCIF0_MBxCF register will be setup correctly for this setup too. + + This was noticed with the 512MB DIMM on Canyonlands/Glacier. + + Signed-off-by: Stefan Roese <sr@denx.de> + +commit 76617299358ebba260ecc02d33e8e75d8d13dd3b +Author: Wolfgang Denk <wd@denx.de> +Date: Tue Apr 29 23:41:06 2008 +0200 + + Prepare v1.3.3-rc2, again. + + Signed-off-by: Wolfgang Denk <wd@denx.de> + commit b7fcc4c13993782342cf5cd20d237a6281648a0b Author: Wolfgang Denk <wd@denx.de> Date: Tue Apr 29 23:35:24 2008 +0200 @@ -42,6 +42,7 @@ LIST_5xxx=" \ fo300 \ icecube_5100 \ icecube_5200 \ + inka4x0 \ lite5200b \ mcc200 \ mecp5200 \ @@ -24,7 +24,7 @@ VERSION = 1 PATCHLEVEL = 3 SUBLEVEL = 3 -EXTRAVERSION = -rc2 +EXTRAVERSION = -rc3 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) VERSION_FILE = $(obj)include/version_autogenerated.h diff --git a/config.mk b/config.mk index 22d3398ca4f..62fc1d5ddbc 100644 --- a/config.mk +++ b/config.mk @@ -69,27 +69,6 @@ PLATFORM_CPPFLAGS+= -D__ARM__ endif endif -# Load generated board configuration -sinclude $(OBJTREE)/include/autoconf.mk - -ifdef ARCH -sinclude $(TOPDIR)/$(ARCH)_config.mk # include architecture dependend rules -endif -ifdef CPU -sinclude $(TOPDIR)/cpu/$(CPU)/config.mk # include CPU specific rules -endif -ifdef SOC -sinclude $(TOPDIR)/cpu/$(CPU)/$(SOC)/config.mk # include SoC specific rules -endif -ifdef VENDOR -BOARDDIR = $(VENDOR)/$(BOARD) -else -BOARDDIR = $(BOARD) -endif -ifdef BOARD -sinclude $(TOPDIR)/board/$(BOARDDIR)/config.mk # include board specific rules -endif - ######################################################################### CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ @@ -127,6 +106,31 @@ OBJCOPY = $(CROSS_COMPILE)objcopy OBJDUMP = $(CROSS_COMPILE)objdump RANLIB = $(CROSS_COMPILE)RANLIB +######################################################################### + +# Load generated board configuration +sinclude $(OBJTREE)/include/autoconf.mk + +ifdef ARCH +sinclude $(TOPDIR)/$(ARCH)_config.mk # include architecture dependend rules +endif +ifdef CPU +sinclude $(TOPDIR)/cpu/$(CPU)/config.mk # include CPU specific rules +endif +ifdef SOC +sinclude $(TOPDIR)/cpu/$(CPU)/$(SOC)/config.mk # include SoC specific rules +endif +ifdef VENDOR +BOARDDIR = $(VENDOR)/$(BOARD) +else +BOARDDIR = $(BOARD) +endif +ifdef BOARD +sinclude $(TOPDIR)/board/$(BOARDDIR)/config.mk # include board specific rules +endif + +######################################################################### + ifneq (,$(findstring s,$(MAKEFLAGS))) ARFLAGS = cr else diff --git a/cpu/mcf5227x/config.mk b/cpu/mcf5227x/config.mk index 2e5069687c9..8d60fd66bf0 100644 --- a/cpu/mcf5227x/config.mk +++ b/cpu/mcf5227x/config.mk @@ -24,7 +24,7 @@ # PLATFORM_RELFLAGS += -ffixed-d7 -msep-data -ifeq ($(findstring 4.2,$(shell $(CROSS_COMPILE)gcc --version)),4.2) +ifeq ($(findstring 4.2,$(shell $(CC) --version)),4.2) PLATFORM_CPPFLAGS += -mcpu=5208 -fPIC else PLATFORM_CPPFLAGS += -m5307 -fPIC diff --git a/cpu/mcf523x/config.mk b/cpu/mcf523x/config.mk index 73fb08d1cec..93645a31e0a 100644 --- a/cpu/mcf523x/config.mk +++ b/cpu/mcf523x/config.mk @@ -24,7 +24,7 @@ # PLATFORM_RELFLAGS += -ffixed-d7 -msep-data -ifeq ($(findstring 4.2,$(shell $(CROSS_COMPILE)gcc --version)),4.2) +ifeq ($(findstring 4.2,$(shell $(CC) --version)),4.2) PLATFORM_CPPFLAGS += -mcpu=5235 -fPIC else PLATFORM_CPPFLAGS += -m5307 -fPIC diff --git a/cpu/mcf52x2/config.mk b/cpu/mcf52x2/config.mk index be360f88229..650e340aee8 100644 --- a/cpu/mcf52x2/config.mk +++ b/cpu/mcf52x2/config.mk @@ -34,7 +34,7 @@ is5275:=$(shell grep CONFIG_M5275 $(TOPDIR)/include/$(cfg)) is5282:=$(shell grep CONFIG_M5282 $(TOPDIR)/include/$(cfg)) -ifeq ($(findstring 4.2,$(shell $(CROSS_COMPILE)gcc --version)),4.2) +ifeq ($(findstring 4.2,$(shell $(CC) --version)),4.2) ifneq (,$(findstring CONFIG_M5249,$(is5249))) PLATFORM_CPPFLAGS += -mcpu=5249 diff --git a/cpu/mcf532x/config.mk b/cpu/mcf532x/config.mk index e4a3cf9fdcb..16a0bc3264b 100644 --- a/cpu/mcf532x/config.mk +++ b/cpu/mcf532x/config.mk @@ -24,7 +24,7 @@ # PLATFORM_RELFLAGS += -ffixed-d7 -msep-data -ifeq ($(findstring 4.2,$(shell $(CROSS_COMPILE)gcc --version)),4.2) +ifeq ($(findstring 4.2,$(shell $(CC) --version)),4.2) PLATFORM_CPPFLAGS += -mcpu=5329 -fPIC else PLATFORM_CPPFLAGS += -m5307 -fPIC diff --git a/cpu/mcf5445x/config.mk b/cpu/mcf5445x/config.mk index a85d0f9fc50..88433f2f6d6 100644 --- a/cpu/mcf5445x/config.mk +++ b/cpu/mcf5445x/config.mk @@ -24,7 +24,7 @@ # PLATFORM_RELFLAGS += -ffixed-d7 -msep-data -ifeq ($(findstring 4.2,$(shell $(CROSS_COMPILE)gcc --version)),4.2) +ifeq ($(findstring 4.2,$(shell $(CC) --version)),4.2) PLATFORM_CPPFLAGS += -mcpu=54455 -fPIC else PLATFORM_CPPFLAGS += -m5407 -fPIC diff --git a/cpu/mcf547x_8x/config.mk b/cpu/mcf547x_8x/config.mk index eb6b50b2127..e5f4385dd35 100644 --- a/cpu/mcf547x_8x/config.mk +++ b/cpu/mcf547x_8x/config.mk @@ -24,7 +24,7 @@ # PLATFORM_RELFLAGS += -ffixed-d7 -msep-data -ifeq ($(findstring 4.2,$(shell $(CROSS_COMPILE)gcc --version)),4.2) +ifeq ($(findstring 4.2,$(shell $(CC) --version)),4.2) PLATFORM_CPPFLAGS += -mcpu=5485 -fPIC else PLATFORM_CPPFLAGS += -m5407 -fPIC diff --git a/include/configs/kb9202.h b/include/configs/kb9202.h index 75d9c3b3b46..7dcce836eb7 100644 --- a/include/configs/kb9202.h +++ b/include/configs/kb9202.h @@ -54,10 +54,13 @@ #define CFG_LONGHELP +#ifndef roundup +#define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y)) +#endif /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (roundup(CFG_ENV_SIZE,4096) + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ #define CONFIG_BAUDRATE 115200 diff --git a/post/board/lwmon5/sysmon.c b/post/board/lwmon5/sysmon.c index e9c9624907e..2766224872c 100644 --- a/post/board/lwmon5/sysmon.c +++ b/post/board/lwmon5/sysmon.c @@ -67,7 +67,7 @@ extern int dspic_read(ushort reg); #define TEMPERATURE_MIN (-40) /* degr. C */ #define TEMPERATURE_MAX (+90) /* degr. C */ #define TEMPERATURE_DISPLAY_MIN (-35) /* degr. C */ -#define TEMPERATURE_DISPLAY_MAX (+85) /* degr. C */ +#define TEMPERATURE_DISPLAY_MAX (+85) /* degr. C */ #define VOLTAGE_5V_MIN (+4500) /* mV */ #define VOLTAGE_5V_MAX (+5500) /* mV */ |