summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG372
-rw-r--r--api/README2
-rw-r--r--api/api.c12
-rw-r--r--api/api_net.c2
-rw-r--r--api_examples/Makefile2
-rw-r--r--api_examples/demo.c2
-rw-r--r--api_examples/glue.c4
-rw-r--r--board/atum8548/atum8548.c6
-rw-r--r--board/atum8548/init.S22
-rw-r--r--board/sbc8548/sbc8548.c1
-rw-r--r--drivers/qe/qe.c18
11 files changed, 407 insertions, 36 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 43c0bd5bcc..7b9e34bdd1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,297 @@
+commit 17a41e4492121ccf9fa2c10c2cb1a6d1c18d74f7
+Author: Kim Phillips <kim.phillips@freescale.com>
+Date: Wed Jan 9 16:56:54 2008 -0600
+
+ Add QE brg freq and correct qe bus freq fdt update code
+
+ Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
+ Signed-off-by: Andy Fleming <afleming@freescale.com>
+
+commit 890dfef06c2d169a3356359596890754dfb8ee1c
+Author: Andy Fleming <afleming@freescale.com>
+Date: Wed Jan 9 16:34:51 2008 -0600
+
+ Remove cache config from ATUM8548 and sbc8548 configs
+
+ These boards weren't updated by Kumar's config patch because they
+ weren't in the tree, yet.
+
+ Signed-off-by: Andy Fleming <afleming@freescale.com>
+
+commit b8ec2385038c094b07ec5b49336289a46b6e9cc6
+Author: Timur Tabi <timur@freescale.com>
+Date: Mon Jan 7 13:31:19 2008 -0600
+
+ 85xx: add ability to upload QE firmware
+
+ Define the layout of a binary blob that contains a QE firmware and instructions
+ on how to upload it. Add function qe_upload_firmware() to parse the blob and
+ perform the actual upload. Add command-line command "qe fw" to take a firmware
+ blob in memory and upload it. Update ft_cpu_setup() on 85xx to create the
+ 'firmware' device tree node if U-Boot has uploaded a firmware. Fully define
+ 'struct rsp' in immap_qe.h to include the actual RISC Special Registers.
+
+ Signed-off-by: Timur Tabi <timur@freescale.com>
+
+commit b009f3eca99bb7b9e6ba6639a8909a138dd5e9fe
+Author: Kumar Gala <galak@kernel.crashing.org>
+Date: Tue Jan 8 01:22:21 2008 -0600
+
+ 85xx: Remove cache config from configs.h
+
+ Either use the standard defines in asm/cache.h or grab the information
+ at runtime from the L1CFG SPR.
+
+ Also, minor cleanup in cache.h to make the code a bit more readable.
+
+ Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
+
+commit b964e9368f45372aaf1da0c13fe56f6d81ae8e96
+Author: robert lazarski <robertlazarski@gmail.com>
+Date: Fri Dec 21 10:39:27 2007 -0500
+
+ mpc85xx: Add support for ATUM8548 (updated)
+
+ Add support for Instituto Atlantico's ATUM8548 board
+
+ Signed-off-by: robert lazarski <robertlazarski@gmail.com>
+ Signed-off-by: Andy Fleming <afleming@freescale.com>
+
+commit 7bd6104b71de9bca80ac8e0936003443bb42f2fc
+Author: robert lazarski <robertlazarski@gmail.com>
+Date: Fri Dec 21 10:36:37 2007 -0500
+
+ mpc85xx: Add support for ATUM8548 (updated)
+
+ Add support for Instituto Atlantico's ATUM8548 board
+
+ Signed-off-by: robert lazarski <robertlazarski@gmail.com>
+
+commit 9e3ed392d2c8965e24c942b58796c31c644c2f70
+Author: Joe Hamman <joe.hamman@embeddedspecialties.com>
+Date: Thu Dec 13 06:45:14 2007 -0600
+
+ mpc85xx: Add support for SBC8548 (updated)
+
+ Add support for Wind River's SBC8548 reference board.
+
+ Signed-off by: Joe Hamman <joe.hamman@embeddedspecialties.com>
+
+commit 11c45ebd46d6517b51b7a92dd52a618b2f4e5586
+Author: Joe Hamman <joe.hamman@embeddedspecialties.com>
+Date: Thu Dec 13 06:45:08 2007 -0600
+
+ mpc85xx: Add support for SBC8548 (updated)
+
+ Add support for Wind River's SBC8548 reference board.
+
+ Signed-off by: Joe Hamman <joe.hamman@embeddedspecialties.com>
+ Signed-off by: Andy Fleming <afleming@freescale.com>
+
+commit 64d4bcb087c2ece1c4d0de8efe85e0075e5b1594
+Author: Anton Vorontsov <avorontsov@ru.mvista.com>
+Date: Mon Oct 22 19:58:19 2007 +0400
+
+ MPC8568E-MDS: set up QE pario for UART1
+
+ To use UART1 on the MPC8568E-MDS, QE pario pins PC[0:3] should
+ be set up appropriately.
+
+ Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
+
+commit ad162249cb371e9e38971676f09be791e5f3cf4a
+Author: Anton Vorontsov <avorontsov@ru.mvista.com>
+Date: Mon Oct 22 18:12:46 2007 +0400
+
+ MPC8568E-MDS: reset UCCs to use them reliably
+
+ In order to use GETH1 and GETH2 on the MPC8568E-MDS, we should reset
+ UCCs.
+
+ p.s Similar code exists in the Linux kernel board file (for capability
+ reasons with older U-Boots), but should be removed some day.
+
+ Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
+
+commit 2146cf56821c3364786ca94a7306008c5824b238
+Author: Kumar Gala <galak@kernel.crashing.org>
+Date: Wed Dec 19 01:18:15 2007 -0600
+
+ Reworked FSL Book-E TLB macros to be more readable
+
+ The old macros made it difficult to know what WIMGE and perm bits
+ were set for a TLB entry. Actually use the bit masks for these items
+ since they are only a single bit.
+
+ Also moved the macros into mmu.h out of e500.h since they aren't specific
+ to e500.
+
+ Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
+
+commit 1d47273d46925929f8f2c1913cd96d7257aade88
+Author: Kumar Gala <galak@kernel.crashing.org>
+Date: Tue Dec 18 23:21:51 2007 -0600
+
+ Use FSL Book-E MMU macros from Linux Kernel
+
+ Grab the FSL Book-E MAS register macros from Linux. Also added
+ defines for page sizes up to 4TB and removed SHAREN since it doesnt
+ really exist.
+
+ Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
+
+commit 02df4a270f817ef6ec39047a01b55fecdc5f3b37
+Author: Andy Fleming <afleming@freescale.com>
+Date: Wed Jan 9 13:51:32 2008 -0600
+
+ Fix my own merge stupidity
+
+ Way back in August I merged Heiko's patch:
+ 566a494f592: [PCS440EP] upgrade the PCS440EP board
+
+ with Jon's CONFIG_COMMANDS patches.
+
+ This was done in commit: 6bf6f114dcdd97ec3f80c2761ed40e31229d6b78
+
+ However, in the process, I left out some of Heiko's good changes.
+
+ Now Heiko's and Jon's patches are properly merged in fat_register_device()
+
+ Signed-off-by: Andy Fleming <afleming@freescale.com>
+
+commit 6636b62a6efc7f14e6e788788631ae7a7fca4537
+Author: James Yang <James.Yang@freescale.com>
+Date: Wed Jan 9 11:17:49 2008 -0600
+
+ Expose parse_line() globally.
+
+ Add new function readline_into_buffer() that allows the
+ output of readline to be put into a pointer to char buffer.
+
+ This refactoring allows other functions besides the
+ main command loop to also use the same input mechanism.
+
+ Signed-off-by: James Yang <James.Yang@freescale.com>
+ Acked-by: Jon Loeliger <jdl@freescale.com>
+
+commit 7ca90513486abd4ae50bd1b7403f47cc58c5ad25
+Author: Guennadi Liakhovetski <lg@denx.de>
+Date: Wed Jan 9 01:15:25 2008 +0100
+
+ trivial: fix consequences of a bad merge
+
+ Fix what looks like a merge artifact.
+
+ Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
+
+commit 4785a694c0045996ccf0ac5b8edf531efc1b730e
+Author: Zhang Wei <wei.zhang@freescale.com>
+Date: Thu Jan 3 10:51:15 2008 +0800
+
+ Add Ctrl combo key support to usb keyboard driver.
+
+ Ctrl combo key support is added, which is very useful to input Ctrl-C
+ for interrupt current job.
+ Also add usb_event_poll() calling to usb_kbd_testc(), which can get
+ key input when tstc() is called.
+
+ Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
+
+commit 10c7382bc5d5e64c47f94ac2ca78cc574442e82d
+Author: Marcel Ziswiler <marcel@ziswiler.com>
+Date: Sun Dec 30 03:30:56 2007 +0100
+
+ fix various comments
+
+ Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
+
+commit 7817cb2083d982923752fe0f12b67c0e7c09a027
+Author: Marcel Ziswiler <marcel@ziswiler.com>
+Date: Sun Dec 30 03:30:46 2007 +0100
+
+ fix comments with new drivers organization
+
+ Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
+
+commit a9b410dc7d2a4721c408b13abfc037988150f145
+Author: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
+Date: Fri Dec 28 12:50:59 2007 +0900
+
+ Remove the obsolete terse version of do_mii()
+
+ We now have more useful version of do_mii() and everybody use it.
+ Gerald Van Baren says:
+
+ > When I originally wrote the mii command 6(!) years ago, I wrote a
+ > verbose version that printed human readable decomposition of the flags,
+ > etc., and a terse one that didn't print as much stuff and thus had a
+ > smaller memory footprint.
+ >
+ > It sounds like the terse version has withered and died, apparently
+ > people are only using the verbose version (which is very understandable,
+ > I do myself).
+
+ Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
+ Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
+
+commit 01c687aa6e065bd4faf80f723361e798941dd6b0
+Author: Mike Frysinger <vapier@gentoo.org>
+Date: Thu Dec 27 13:42:56 2007 -0500
+
+ Do not reference sha1.c when building mkimage.
+
+ remove sha1.o from mkimage linking since it isn't actually used.
+
+ Signed-Off-By: Mike Frysinger <vapier@gentoo.org>
+
+commit b9173af73e524d37c812f210173cf83385c5171a
+Author: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
+Date: Thu Dec 27 15:39:54 2007 +0900
+
+ common/cmd_mii.c: Add sanity argc check
+
+ If type mii command without arguments, we suffer from uninitialized argv[]
+ entries; for example we MIPS get stuck by TLB error.
+
+ Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
+
+commit 500856eb1707ed17d9204baa61dd59948d3b2899
+Author: Rafal Jaworowski <raj@semihalf.com>
+Date: Wed Jan 9 19:39:36 2008 +0100
+
+ API for external applications.
+
+ This is an API for external (standalone) applications running on top of
+ U-Boot, and is meant to be more extensible and robust than the existing
+ jumptable mechanism. It is similar to UNIX syscall approach. See api/README
+ for more details.
+
+ Included is the demo application using this new framework (api_examples).
+
+ Please note this is still an experimental feature, and is turned off by
+ default.
+
+ Signed-off-by: Rafal Jaworowski <raj@semihalf.com>
+
+commit 26a41790f8eba19ad450e18ae91351daf485b3e2
+Author: Rafal Jaworowski <raj@semihalf.com>
+Date: Wed Jan 9 18:05:27 2008 +0100
+
+ Globalize envmatch()
+
+ The newly introduced API (routines related to env vars) will need to call
+ it.
+
+ Signed-off-by: Rafal Zabdyr <armo@semihalf.com>
+
+commit 6007f3251c0967adc13f2ed8be1b924ddc30124d
+Author: Wolfgang Denk <wd@denx.de>
+Date: Wed Jan 9 15:14:46 2008 +0100
+
+ Coding Style cleanup, update CHANGELOG
+
+ Signed-off-by: Wolfgang Denk <wd@denx.de>
+
commit fc6414eca55f1fc108fb12fc8cdc43bd8b4463f9
Author: Mike Frysinger <vapier@gentoo.org>
Date: Tue Dec 18 04:29:55 2007 -0500
@@ -98,6 +392,20 @@ Date: Tue Nov 20 13:14:20 2007 +0100
Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
+commit 58694f9709c0c3e3178e349ae748d98cfb0c639a
+Author: Zhang Wei <wei.zhang@freescale.com>
+Date: Thu Jan 3 10:51:15 2008 +0800
+
+ Add Ctrl combo key support to usb keyboard driver.
+
+ Ctrl combo key support is added, which is very useful to input Ctrl-C
+ for interrupt current job.
+ Also add usb_event_poll() calling to usb_kbd_testc(), which can get
+ key input when tstc() is called.
+
+ Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
+ Signed-off-by: Markus Klotzbuecher <mk@denx.de>
+
commit 07eb02687f008721974a2fb54cd7fdc28033ab3c
Author: Wolfgang Denk <wd@denx.de>
Date: Wed Jan 9 13:43:38 2008 +0100
@@ -411,6 +719,28 @@ Date: Tue Jan 8 11:13:09 2008 +0100
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
+commit c83d7ca4dadd44ae430235077f63b64a11f36f6e
+Author: Wolfgang Denk <wd@denx.de>
+Date: Tue Jan 8 22:58:27 2008 +0100
+
+ Fix compile problem with new env code.
+
+ Signed-off-by: Wolfgang Denk <wd@denx.de>
+
+commit 6de66b35426312a21174a9bf0576a094e2904bea
+Author: Markus Klotzbücher <mk@denx.de>
+Date: Tue Nov 27 10:23:20 2007 +0100
+
+ tools: fix fw_printenv tool to compile again
+
+ This patch updates the fw_printenv/fw_setenv userspace tool to include
+ the correct MTD header in order to compile against current kernel
+ headers. Backward compatibility is preserved by introducing an option
+ MTD_VERSION which can be set to "old" for compilation using the old MTD
+ headers. Along with this a number of warnings are fixed.
+
+ Signed-off-by: Markus Klotzbuecher <mk@denx.de>
+
commit ad3006fe7e84667021753b74247b0bafd97ba35f
Author: Gerald Van Baren <vanbaren@cideas.com>
Date: Mon Jan 7 23:47:32 2008 -0500
@@ -4521,6 +4851,48 @@ Date: Wed Oct 3 07:34:10 2007 +0200
Signed-off-by: Stefan Roese <sr@denx.de>
+commit 245a362ad3c0c1b84fccc9fec7b623eb14f6e502
+Author: Marian Balakowicz <m8@semihalf.com>
+Date: Wed Oct 24 01:37:36 2007 +0200
+
+ TQM5200: Call usb_cpu_init() during board init
+
+ usb_cpu_init() configures GPS USB pins, clocks, etc. and
+ is required for proper operation of kernel USB subsystem.
+ This setup was previously done in the kernel by the fixup
+ code which is being removed, thus low level init must be
+ done by U-boot now.
+
+ Signed-off-by: Marian Balakowicz <m8@semihalf.com>
+ Signed-off-by: Markus Klotzbuecher <mk@denx.de>
+
+commit b5af773f8d92677e06f3295b45557c9d0a487c24
+Author: Zhang Wei <wei.zhang@freescale.com>
+Date: Thu Oct 25 17:51:27 2007 +0800
+
+ Fix the issue of usb_kbd driver missing the scan code of key 'z'.
+
+ The scan code of the key 'z' is 0x1d, which should be handled.
+
+ The change has be tested on NOVATEK USB keyboard and ULI PCI OHCI
+ controller.
+
+ Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
+ Signed-off-by: Markus Klotzbuecher <mk@denx.de>
+
+commit 85ac988e86f9414fa645b0148dc66c3520a1eb84
+Author: Rodolfo Giometti <giometti@enneenne.com>
+Date: Mon Oct 15 11:59:17 2007 +0200
+
+ PXA USB OHCI: "usb stop" implementation.
+
+ Some USB keys need to be switched off before loading the kernel
+ otherwise they can remain in an undefined status which prevents them
+ to be correctly recognized by the kernel.
+
+ Signed-off-by: Rodolfo Giometti <giometti@linux.it>
+ Signed-off-by: Markus Klotzbuecher <mk@denx.de>
+
commit 31548249decf18a6b877a18436b6139dd483fe4a
Author: Justin Flammia <jflammia@savantav.com>
Date: Mon Oct 29 17:40:35 2007 -0400
diff --git a/api/README b/api/README
index c8f9c457c4..6df225f584 100644
--- a/api/README
+++ b/api/README
@@ -22,7 +22,7 @@ U-Boot machine/arch independent API for external apps
- the U-Boot integral part of the API is meant to be thin and non-intrusive,
leaving as much processing as possible on the consumer application side,
for example it doesn't keep states, but relies on hints from the app and
- so on
+ so on
- optional (CONFIG_API)
diff --git a/api/api.c b/api/api.c
index 10f83eb691..0598d9082d 100644
--- a/api/api.c
+++ b/api/api.c
@@ -231,7 +231,7 @@ static int API_dev_enum(va_list ap)
/* start over - clean up enumeration */
dev_enum_reset(); /* XXX shouldn't the name contain 'stor'? */
debugf("RESTART ENUM\n");
-
+
/* net device enumeration first */
if (dev_enum_net(di))
return 0;
@@ -365,7 +365,7 @@ static int API_dev_write(va_list ap)
return API_EINVAL;
if (di->type & DEV_TYP_STOR)
- /*
+ /*
* write to storage is currently not supported by U-Boot:
* no storage device implements block_write() method
*/
@@ -523,7 +523,7 @@ static int API_env_enum(va_list ap)
char *last, **next;
last = (char *)va_arg(ap, u_int32_t);
-
+
if ((next = (char **)va_arg(ap, u_int32_t)) == NULL)
return API_EINVAL;
@@ -540,7 +540,7 @@ static int API_env_enum(va_list ap)
return 0;
}
}
-
+
if (envmatch((uchar *)last, i) < 0)
continue;
@@ -567,7 +567,7 @@ static cfp_t calls_table[API_MAXCALL] = { NULL, };
* serviced until finished.
*
* e.g. syscall(1, int *, u_int32_t, u_int32_t, u_int32_t, u_int32_t);
- *
+ *
* call: syscall number
*
* retval: points to the return value placeholder, this is the place the
@@ -655,7 +655,7 @@ void platform_set_mr(struct sys_info *si, unsigned long start, unsigned long siz
if (!si->mr || !size || (flags == 0))
return;
-
+
/* find free slot */
for (i = 0; i < si->mr_no; i++)
if (si->mr[i].flags == 0) {
diff --git a/api/api_net.c b/api/api_net.c
index 9b20a1740c..9611ab0dda 100644
--- a/api/api_net.c
+++ b/api/api_net.c
@@ -75,7 +75,7 @@ int dev_close_net(void *cookie)
return 0;
}
-/*
+/*
* There can only be one active eth interface at a time - use what is
* currently set to eth_current
*/
diff --git a/api_examples/Makefile b/api_examples/Makefile
index 5812bcd337..cb49a9ea79 100644
--- a/api_examples/Makefile
+++ b/api_examples/Makefile
@@ -71,7 +71,7 @@ $(BIN):
$(obj)%.bin: $(obj)%
$(OBJCOPY) -O binary $< $@ 2>/dev/null
-$(obj)crc32.c:
+$(obj)crc32.c:
@rm -f $(obj)crc32.c
ln -s $(src)../lib_generic/crc32.c $(obj)crc32.c
diff --git a/api_examples/demo.c b/api_examples/demo.c
index a4aeef183b..eae9712b71 100644
--- a/api_examples/demo.c
+++ b/api_examples/demo.c
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
/* enumerate devices */
printf("\n*** Enumerate devices ***\n");
devs_no = ub_dev_enum();
-
+
printf("Number of devices found: %d\n", devs_no);
if (devs_no == 0)
return -1;
diff --git a/api_examples/glue.c b/api_examples/glue.c
index 75983691fd..2bf47ae3d2 100644
--- a/api_examples/glue.c
+++ b/api_examples/glue.c
@@ -150,7 +150,7 @@ struct sys_info * ub_get_sys_info(void)
* timing
*
****************************************/
-
+
void ub_udelay(unsigned long usec)
{
syscall(API_UDELAY, NULL, &usec);
@@ -298,7 +298,7 @@ int ub_dev_read(int handle, void *buf, lbasize_t len, lbastart_t start)
if (!syscall(API_DEV_READ, &err, di, buf, &len, &start, &act_len))
return -1;
- if (err)
+ if (err)
return err;
if (act_len != len)
diff --git a/board/atum8548/atum8548.c b/board/atum8548/atum8548.c
index 4d7dc7728c..f11abd816b 100644
--- a/board/atum8548/atum8548.c
+++ b/board/atum8548/atum8548.c
@@ -140,7 +140,7 @@ testdram(void)
for (p = pstart; p < pend; p++) {
printf ("DRAM test attempting to write 0xaaaaaaaa at: %08x\n", (uint) p);
*p = 0xaaaaaaaa;
- }
+ }
for (p = pstart; p < pend; p++) {
if (*p != 0xaaaaaaaa) {
@@ -191,7 +191,7 @@ pci_init_board(void)
debug (" pci_init_board: devdisr=%x, io_sel=%x, host_agent=%x\n",
devdisr, io_sel, host_agent);
- /* explicitly set 'Clock out select register' to echo SYSCLK input to our CPLD */
+ /* explicitly set 'Clock out select register' to echo SYSCLK input to our CPLD */
gur->clkocr |= MPC85xx_ATUM_CLKOCR;
if (io_sel & 1) {
@@ -376,7 +376,7 @@ pci_init_board(void)
int last_stage_init(void)
{
- int ic = icache_status ();
+ int ic = icache_status ();
printf ("icache_status: %d\n", ic);
return 0;
}
diff --git a/board/atum8548/init.S b/board/atum8548/init.S
index a410e2e568..654a569907 100644
--- a/board/atum8548/init.S
+++ b/board/atum8548/init.S
@@ -70,7 +70,7 @@ tlb1_entry:
/*
* Number of TLB0 and TLB1 entries in the following table
*/
- .long (2f-1f)/16
+ .long (2f-1f)/16
1:
#if (CFG_CCSRBAR_DEFAULT != CFG_CCSRBAR)
@@ -182,15 +182,15 @@ tlb1_entry:
/*
* LAW(Local Access Window) configuration:
*
- * 0x0000_0000 0x7fff_ffff DDR 2G
- * 0x8000_0000 0x9fff_ffff PCI1 MEM 512M
- * 0xa000_0000 0xbfff_ffff PCIe MEM 512M
- * 0xc000_0000 0xdfff_ffff PCI2 MEM 512M
- * 0xe000_0000 0xe000_ffff CCSR 1M
- * 0xe200_0000 0xe10f_ffff PCI1 IO 1M
- * 0xe280_0000 0xe20f_ffff PCI2 IO 1M
- * 0xe300_0000 0xe30f_ffff PCIe IO 1M
- * 0xf800_0000 0xffff_ffff FLASH (boot bank) 128M
+ * 0x0000_0000 0x7fff_ffff DDR 2G
+ * 0x8000_0000 0x9fff_ffff PCI1 MEM 512M
+ * 0xa000_0000 0xbfff_ffff PCIe MEM 512M
+ * 0xc000_0000 0xdfff_ffff PCI2 MEM 512M
+ * 0xe000_0000 0xe000_ffff CCSR 1M
+ * 0xe200_0000 0xe10f_ffff PCI1 IO 1M
+ * 0xe280_0000 0xe20f_ffff PCI2 IO 1M
+ * 0xe300_0000 0xe30f_ffff PCIe IO 1M
+ * 0xf800_0000 0xffff_ffff FLASH (boot bank) 128M
*
* Notes:
* CCSRBAR and L2-as-SRAM don't need a configured Local Access Window.
@@ -227,7 +227,7 @@ law_entry:
.long (CFG_PCIE1_IO_PHYS>>12) & 0xfffff
.long LAWAR_EN | LAWAR_TRGT_PCIE | (LAWAR_SIZE & LAWAR_SIZE_1M)
- /* LBC window - maps 256M 0xf0000000 -> 0xffffffff */
+ /* LBC window - maps 256M 0xf0000000 -> 0xffffffff */
.long (CFG_LBC_CACHE_BASE>>12) & 0xfffff
.long LAWAR_EN | LAWAR_TRGT_IF_LBC | (LAWAR_SIZE & LAWAR_SIZE_256M)
diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c
index 5e258f5d69..65052e60c8 100644
--- a/board/sbc8548/sbc8548.c
+++ b/board/sbc8548/sbc8548.c
@@ -566,4 +566,3 @@ ft_board_setup(void *blob, bd_t *bd)
#endif
}
#endif
-
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index 276788c857..c802014a50 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -35,7 +35,7 @@ DECLARE_GLOBAL_DATA_PTR;
void qe_issue_cmd(uint cmd, uint sbc, u8 mcn, u32 cmd_data)
{
- u32 cecr;
+ u32 cecr;
if (cmd == QE_RESET) {
out_be32(&qe_immr->cp.cecr,(u32) (cmd | QE_CR_FLG));
@@ -357,10 +357,10 @@ int qe_upload_firmware(const struct qe_firmware *firmware)
return -EPERM;
}
- /*
- * Validate the CRC. We would normally call crc32_no_comp(), but that
- * function isn't available unless you turn on JFFS support.
- */
+ /*
+ * Validate the CRC. We would normally call crc32_no_comp(), but that
+ * function isn't available unless you turn on JFFS support.
+ */
crc = be32_to_cpu(*(u32 *)((void *)firmware + calc_size));
if (crc != (crc32(-1, (const void *) firmware, calc_size) ^ -1)) {
printf("Firmware CRC is invalid\n");
@@ -438,10 +438,10 @@ static int qe_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return -EINVAL;
}
- /*
- * If a length was supplied, compare that with the 'length'
- * field.
- */
+ /*
+ * If a length was supplied, compare that with the 'length'
+ * field.
+ */
if (argc > 3) {
ulong length = simple_strtoul(argv[3], NULL, 16);
OpenPOWER on IntegriCloud