* [U-Boot-Users] Please pull u-boot-mpc85xx.git
@ 2008-01-17 22:20 Andy Fleming
2008-01-23 13:17 ` Wolfgang Denk
0 siblings, 1 reply; 33+ messages in thread
From: Andy Fleming @ 2008-01-17 22:20 UTC (permalink / raw)
To: u-boot
are found in the git repository at:
git://www.denx.de/git/u-boot-mpc85xx.git
Andy Fleming (1):
Merge branch 'kumar'
Kumar Gala (23):
85xx: Move LAW init code into C
85xx: convert MPC8544 DS over to use new LAW init code
85xx: convert MPC8540/MPC8560 ADS over to use new LAW init code
85xx: convert MPC8541/MPC8555/MPC8548 CDS over to use new LAW init code
85xx: convert SBC8540/SBC8560/SBC8548 over to use new LAW init code
85xx: convert PM854/PM856 over to use new LAW init code
85xx: convert STXGP3/STXSSA over to use new LAW init code
85xx: convert remaining 85xx boards over to use new LAW init code
85xx: Remove old style of LAW init
85xx: Use proper defines for PCI addresses
85xx: Introduce new tlb API
85xx: Reworked initial processor init
85xx: Convert MPC8544 DS to new TLB setup
85xx: Convert ATUM8548 to new TLB setup
85xx: Convert MPC8540/MPC8560 ADS to new TLB setup
85xx: Convert MPC8541/MPC8555/MPC8548 CDS to new TLB setup
85xx: Convert MPC8568 MDS to new TLB setup
85xx: Convert MPC8540EVAL to new TLB setup
85xx: Convert PM854/PM856 to new TLB setup
85xx: Convert SBC8540/SBC8560/SBC8548 to new TLB setup
85xx: Convert STXGP3 & STXSSA to new TLB setup
85xx: Convert TQM85xx to new TLB setup
85xx: Get ride of old TLB setup code
board/atum8548/Makefile | 4 +-
board/atum8548/init.S | 235 ----------------------------
board/atum8548/law.c | 61 ++++++++
board/atum8548/tlb.c | 90 +++++++++++
board/atum8548/u-boot.lds | 2 -
board/freescale/mpc8540ads/Makefile | 4 +-
board/freescale/mpc8540ads/init.S | 265 --------------------------------
board/freescale/mpc8540ads/law.c | 58 +++++++
board/freescale/mpc8540ads/tlb.c | 130 ++++++++++++++++
board/freescale/mpc8540ads/u-boot.lds | 2 -
board/freescale/mpc8541cds/Makefile | 4 +-
board/freescale/mpc8541cds/init.S | 243 -----------------------------
board/freescale/mpc8541cds/law.c | 58 +++++++
board/freescale/mpc8541cds/tlb.c | 112 ++++++++++++++
board/freescale/mpc8541cds/u-boot.lds | 2 -
board/freescale/mpc8544ds/Makefile | 4 +-
board/freescale/mpc8544ds/init.S | 222 ---------------------------
board/freescale/mpc8544ds/law.c | 42 +++++
board/freescale/mpc8544ds/tlb.c | 99 ++++++++++++
board/freescale/mpc8544ds/u-boot.lds | 2 -
board/freescale/mpc8548cds/Makefile | 4 +-
board/freescale/mpc8548cds/init.S | 252 ------------------------------
board/freescale/mpc8548cds/law.c | 73 +++++++++
board/freescale/mpc8548cds/tlb.c | 104 +++++++++++++
board/freescale/mpc8548cds/u-boot.lds | 2 -
board/freescale/mpc8555cds/Makefile | 4 +-
board/freescale/mpc8555cds/init.S | 243 -----------------------------
board/freescale/mpc8555cds/law.c | 58 +++++++
board/freescale/mpc8555cds/tlb.c | 112 ++++++++++++++
board/freescale/mpc8555cds/u-boot.lds | 2 -
board/freescale/mpc8560ads/Makefile | 4 +-
board/freescale/mpc8560ads/init.S | 266 --------------------------------
board/freescale/mpc8560ads/law.c | 58 +++++++
board/freescale/mpc8560ads/tlb.c | 130 ++++++++++++++++
board/freescale/mpc8560ads/u-boot.lds | 2 -
board/freescale/mpc8568mds/Makefile | 4 +-
board/freescale/mpc8568mds/init.S | 236 ----------------------------
board/freescale/mpc8568mds/law.c | 62 ++++++++
board/freescale/mpc8568mds/tlb.c | 100 ++++++++++++
board/freescale/mpc8568mds/u-boot.lds | 2 -
board/mpc8540eval/Makefile | 5 +-
board/mpc8540eval/init.S | 178 ---------------------
board/mpc8540eval/law.c | 54 +++++++
board/mpc8540eval/tlb.c | 78 ++++++++++
board/mpc8540eval/u-boot.lds | 2 -
board/pm854/Makefile | 4 +-
board/pm854/init.S | 251 ------------------------------
board/pm854/law.c | 58 +++++++
board/pm854/tlb.c | 117 ++++++++++++++
board/pm854/u-boot.lds | 2 -
board/pm856/Makefile | 4 +-
board/pm856/init.S | 251 ------------------------------
board/pm856/law.c | 58 +++++++
board/pm856/tlb.c | 117 ++++++++++++++
board/pm856/u-boot.lds | 2 -
board/sbc8548/Makefile | 4 +-
board/sbc8548/init.S | 241 -----------------------------
board/sbc8548/law.c | 57 +++++++
board/sbc8548/tlb.c | 108 +++++++++++++
board/sbc8548/u-boot.lds | 2 -
board/sbc8560/Makefile | 4 +-
board/sbc8560/init.S | 165 --------------------
board/sbc8560/law.c | 60 +++++++
board/sbc8560/tlb.c | 65 ++++++++
board/sbc8560/u-boot.lds | 2 -
board/stxgp3/Makefile | 4 +-
board/stxgp3/init.S | 272 ---------------------------------
board/stxgp3/law.c | 58 +++++++
board/stxgp3/tlb.c | 130 ++++++++++++++++
board/stxgp3/u-boot.lds | 2 -
board/stxssa/Makefile | 3 +-
board/stxssa/init.S | 244 -----------------------------
board/stxssa/law.c | 60 +++++++
board/stxssa/tlb.c | 106 +++++++++++++
board/stxssa/u-boot.lds | 2 -
board/tqm85xx/Makefile | 4 +-
board/tqm85xx/init.S | 222 ---------------------------
board/tqm85xx/law.c | 54 +++++++
board/tqm85xx/tlb.c | 114 ++++++++++++++
board/tqm85xx/u-boot.lds | 2 -
cpu/mpc85xx/Makefile | 2 +-
cpu/mpc85xx/cpu_init.c | 38 +++++-
cpu/mpc85xx/spd_sdram.c | 28 +---
cpu/mpc85xx/start.S | 147 ++++++++----------
cpu/mpc85xx/tlb.c | 93 +++++++++++
drivers/misc/Makefile | 1 +
drivers/misc/fsl_law.c | 70 +++++++++
include/asm-ppc/fsl_law.h | 80 ++++++++++
include/asm-ppc/mmu.h | 31 ++++
include/configs/ATUM8548.h | 2 +
include/configs/MPC8540ADS.h | 1 +
include/configs/MPC8540EVAL.h | 2 +
include/configs/MPC8541CDS.h | 1 +
include/configs/MPC8544DS.h | 2 +
include/configs/MPC8548CDS.h | 1 +
include/configs/MPC8555CDS.h | 1 +
include/configs/MPC8560ADS.h | 1 +
include/configs/MPC8568MDS.h | 1 +
include/configs/PM854.h | 1 +
include/configs/PM856.h | 1 +
include/configs/SBC8540.h | 1 +
include/configs/TQM85xx.h | 2 +
include/configs/sbc8548.h | 1 +
include/configs/sbc8560.h | 1 +
include/configs/stxgp3.h | 1 +
include/configs/stxssa.h | 1 +
106 files changed, 3062 insertions(+), 3972 deletions(-)
delete mode 100644 board/atum8548/init.S
create mode 100644 board/atum8548/law.c
create mode 100644 board/atum8548/tlb.c
delete mode 100644 board/freescale/mpc8540ads/init.S
create mode 100644 board/freescale/mpc8540ads/law.c
create mode 100644 board/freescale/mpc8540ads/tlb.c
delete mode 100644 board/freescale/mpc8541cds/init.S
create mode 100644 board/freescale/mpc8541cds/law.c
create mode 100644 board/freescale/mpc8541cds/tlb.c
delete mode 100644 board/freescale/mpc8544ds/init.S
create mode 100644 board/freescale/mpc8544ds/law.c
create mode 100644 board/freescale/mpc8544ds/tlb.c
delete mode 100644 board/freescale/mpc8548cds/init.S
create mode 100644 board/freescale/mpc8548cds/law.c
create mode 100644 board/freescale/mpc8548cds/tlb.c
delete mode 100644 board/freescale/mpc8555cds/init.S
create mode 100644 board/freescale/mpc8555cds/law.c
create mode 100644 board/freescale/mpc8555cds/tlb.c
delete mode 100644 board/freescale/mpc8560ads/init.S
create mode 100644 board/freescale/mpc8560ads/law.c
create mode 100644 board/freescale/mpc8560ads/tlb.c
delete mode 100644 board/freescale/mpc8568mds/init.S
create mode 100644 board/freescale/mpc8568mds/law.c
create mode 100644 board/freescale/mpc8568mds/tlb.c
delete mode 100644 board/mpc8540eval/init.S
create mode 100644 board/mpc8540eval/law.c
create mode 100644 board/mpc8540eval/tlb.c
delete mode 100644 board/pm854/init.S
create mode 100644 board/pm854/law.c
create mode 100644 board/pm854/tlb.c
delete mode 100644 board/pm856/init.S
create mode 100644 board/pm856/law.c
create mode 100644 board/pm856/tlb.c
delete mode 100644 board/sbc8548/init.S
create mode 100644 board/sbc8548/law.c
create mode 100644 board/sbc8548/tlb.c
delete mode 100644 board/sbc8560/init.S
create mode 100644 board/sbc8560/law.c
create mode 100644 board/sbc8560/tlb.c
delete mode 100644 board/stxgp3/init.S
create mode 100644 board/stxgp3/law.c
create mode 100644 board/stxgp3/tlb.c
delete mode 100644 board/stxssa/init.S
create mode 100644 board/stxssa/law.c
create mode 100644 board/stxssa/tlb.c
delete mode 100644 board/tqm85xx/init.S
create mode 100644 board/tqm85xx/law.c
create mode 100644 board/tqm85xx/tlb.c
create mode 100644 cpu/mpc85xx/tlb.c
create mode 100644 drivers/misc/fsl_law.c
create mode 100644 include/asm-ppc/fsl_law.h
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot-Users] Please pull u-boot-mpc85xx.git
2008-01-17 22:20 [U-Boot-Users] Please pull u-boot-mpc85xx.git Andy Fleming
@ 2008-01-23 13:17 ` Wolfgang Denk
2008-01-23 15:46 ` Timur Tabi
0 siblings, 1 reply; 33+ messages in thread
From: Wolfgang Denk @ 2008-01-23 13:17 UTC (permalink / raw)
To: u-boot
In message <12006084583641-git-send-email-afleming@freescale.com> you wrote:
> are found in the git repository at:
>
> git://www.denx.de/git/u-boot-mpc85xx.git
>
> Andy Fleming (1):
> Merge branch 'kumar'
>
> Kumar Gala (23):
> 85xx: Move LAW init code into C
> 85xx: convert MPC8544 DS over to use new LAW init code
> 85xx: convert MPC8540/MPC8560 ADS over to use new LAW init code
> 85xx: convert MPC8541/MPC8555/MPC8548 CDS over to use new LAW init code
> 85xx: convert SBC8540/SBC8560/SBC8548 over to use new LAW init code
> 85xx: convert PM854/PM856 over to use new LAW init code
> 85xx: convert STXGP3/STXSSA over to use new LAW init code
> 85xx: convert remaining 85xx boards over to use new LAW init code
> 85xx: Remove old style of LAW init
> 85xx: Use proper defines for PCI addresses
> 85xx: Introduce new tlb API
> 85xx: Reworked initial processor init
> 85xx: Convert MPC8544 DS to new TLB setup
> 85xx: Convert ATUM8548 to new TLB setup
> 85xx: Convert MPC8540/MPC8560 ADS to new TLB setup
> 85xx: Convert MPC8541/MPC8555/MPC8548 CDS to new TLB setup
> 85xx: Convert MPC8568 MDS to new TLB setup
> 85xx: Convert MPC8540EVAL to new TLB setup
> 85xx: Convert PM854/PM856 to new TLB setup
> 85xx: Convert SBC8540/SBC8560/SBC8548 to new TLB setup
> 85xx: Convert STXGP3 & STXSSA to new TLB setup
> 85xx: Convert TQM85xx to new TLB setup
> 85xx: Get ride of old TLB setup code
Applied. Also tested on STX GP3SSA (8555 version) and TQM8540. Both
work fine.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Violence in reality is quite different from theory.
-- Spock, "The Cloud Minders", stardate 5818.4
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot-Users] Please pull u-boot-mpc85xx.git
2008-01-23 13:17 ` Wolfgang Denk
@ 2008-01-23 15:46 ` Timur Tabi
0 siblings, 0 replies; 33+ messages in thread
From: Timur Tabi @ 2008-01-23 15:46 UTC (permalink / raw)
To: u-boot
Wolfgang Denk wrote:
> Applied. Also tested on STX GP3SSA (8555 version) and TQM8540. Both
> work fine.
Wolfgang, you forgot two patches. These patches were posted to this mailing
list, but not included in any custodian repo:
[PATCH] QE: Move FDT support into a common file
[PATCH v2] Remove #undef DEBUGx and #define DEBUG from all board header files
--
Timur Tabi
Linux kernel developer at Freescale
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot-Users] Please pull u-boot-mpc85xx.git
@ 2008-07-15 1:35 Andy Fleming
2008-07-15 19:37 ` Wolfgang Denk
0 siblings, 1 reply; 33+ messages in thread
From: Andy Fleming @ 2008-07-15 1:35 UTC (permalink / raw)
To: u-boot
are available in the git repository at:
git://www.denx.de/git/u-boot-mpc85xx.git master
Andrew Klossner (1):
Change the temp map to ROM to align addresses to page size.
Andy Fleming (4):
Remove LBC_CACHE_BASE from 8544 DS
Fix indentation for default boot environment variables
Remove fake flash bank from 8544 DS
Clean up INIT_RAM options
Kim Phillips (2):
fdt: add crypto node handling for MPC8{3, 5}xxE processors
mpc85xx: use IS_E_PROCESSOR macro
Kumar Gala (4):
85xx: Cleanup L2 cache size detection
MPC8544DS: Report board id, board version and fpga version.
85xx: Add some L1/L2 SPR register definitions
MPC8544DS: Add ATI Video card support
Paul Gortmaker (7):
8xxx-fdt: set ns16550 clock from CFG_NS16550_CLK, not bi_busfreq
sbc8560: proper definitions for TSEC.
sbc8560: properly set cs0_bnds for 512MB
sbc8560: define eth0 and eth1 instead of eth1 and eth2
sbc8560: add in ft_board_setup()
sbc8560: add default fdt values
sbc8560: enable CONFIG_OF_LIBFDT by default
board/freescale/mpc8544ds/law.c | 2 +-
board/freescale/mpc8544ds/mpc8544ds.c | 5 +-
board/freescale/mpc8544ds/tlb.c | 12 +---
board/freescale/mpc8544ds/u-boot.lds | 1 +
board/sbc8560/sbc8560.c | 32 ++++++++
common/fdt_support.c | 87 ++++++++++++++++++++++
cpu/mpc83xx/fdt.c | 20 +++++-
cpu/mpc85xx/cpu.c | 2 +-
cpu/mpc85xx/cpu_init.c | 47 ++++++++-----
cpu/mpc85xx/fdt.c | 7 ++-
cpu/mpc85xx/start.S | 9 ++-
cpu/mpc86xx/fdt.c | 2 +-
include/asm-ppc/processor.h | 29 ++++++++
include/configs/MPC8544DS.h | 52 ++++++++------
include/configs/MPC8560ADS.h | 38 +++++-----
include/configs/sbc8560.h | 128 ++++++++++++++++++++++----------
include/fdt_support.h | 6 ++
include/mpc83xx.h | 7 ++-
18 files changed, 366 insertions(+), 120 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot-Users] Please pull u-boot-mpc85xx.git
2008-07-15 1:35 Andy Fleming
@ 2008-07-15 19:37 ` Wolfgang Denk
0 siblings, 0 replies; 33+ messages in thread
From: Wolfgang Denk @ 2008-07-15 19:37 UTC (permalink / raw)
To: u-boot
In message <1216085749-20870-1-git-send-email-afleming@freescale.com> you wrote:
> are available in the git repository at:
>
> git://www.denx.de/git/u-boot-mpc85xx.git master
>
> Andrew Klossner (1):
> Change the temp map to ROM to align addresses to page size.
>
> Andy Fleming (4):
> Remove LBC_CACHE_BASE from 8544 DS
> Fix indentation for default boot environment variables
> Remove fake flash bank from 8544 DS
> Clean up INIT_RAM options
>
> Kim Phillips (2):
> fdt: add crypto node handling for MPC8{3, 5}xxE processors
> mpc85xx: use IS_E_PROCESSOR macro
>
> Kumar Gala (4):
> 85xx: Cleanup L2 cache size detection
> MPC8544DS: Report board id, board version and fpga version.
> 85xx: Add some L1/L2 SPR register definitions
> MPC8544DS: Add ATI Video card support
>
> Paul Gortmaker (7):
> 8xxx-fdt: set ns16550 clock from CFG_NS16550_CLK, not bi_busfreq
> sbc8560: proper definitions for TSEC.
> sbc8560: properly set cs0_bnds for 512MB
> sbc8560: define eth0 and eth1 instead of eth1 and eth2
> sbc8560: add in ft_board_setup()
> sbc8560: add default fdt values
> sbc8560: enable CONFIG_OF_LIBFDT by default
>
> board/freescale/mpc8544ds/law.c | 2 +-
> board/freescale/mpc8544ds/mpc8544ds.c | 5 +-
> board/freescale/mpc8544ds/tlb.c | 12 +---
> board/freescale/mpc8544ds/u-boot.lds | 1 +
> board/sbc8560/sbc8560.c | 32 ++++++++
> common/fdt_support.c | 87 ++++++++++++++++++++++
> cpu/mpc83xx/fdt.c | 20 +++++-
> cpu/mpc85xx/cpu.c | 2 +-
> cpu/mpc85xx/cpu_init.c | 47 ++++++++-----
> cpu/mpc85xx/fdt.c | 7 ++-
> cpu/mpc85xx/start.S | 9 ++-
> cpu/mpc86xx/fdt.c | 2 +-
> include/asm-ppc/processor.h | 29 ++++++++
> include/configs/MPC8544DS.h | 52 ++++++++------
> include/configs/MPC8560ADS.h | 38 +++++-----
> include/configs/sbc8560.h | 128 ++++++++++++++++++++++----------
> include/fdt_support.h | 6 ++
> include/mpc83xx.h | 7 ++-
> 18 files changed, 366 insertions(+), 120 deletions(-)
Done, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A right is not what someone gives you; it's what no one can take from
you. - Ramsey Clark
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot-Users] Please pull u-boot-mpc85xx.git
@ 2008-06-11 7:18 Andy Fleming
0 siblings, 0 replies; 33+ messages in thread
From: Andy Fleming @ 2008-06-11 7:18 UTC (permalink / raw)
To: u-boot
are available in the git repository at:
git://www.denx.de/git/u-boot-mpc85xx.git master
Note that some of the patches are not strictly 85xx, however they were
either necessary, or just more convenient this way. If someone objects to a
particular patch, I can certainly pull it if that's deemed best.
Andy Fleming (1):
socrates: Fix PCI clk fix patch
Anton Vorontsov (2):
83xx/85xx/86xx: factor out Freescale Localbus defines out of mpc83xx.h
83xx/85xx: further localbus cleanups
Becky Bruce (1):
MPC85xx: Change traps.c to not reference non-addressable memory
Kumar Gala (9):
85xx: Only use PORPLLSR[DDR_Ratio] on platforms that define it
85xx: expose cpu identification
85xx: Add setting of cache props in the device tree.
85xx: Remove unused and unconfigured memory test code.
MPC8544DS: Update config.h
85xx: remove dummy board_early_init_f
Make it so we keep track of which LAWs have allocated and provide
With the new LAW interface (set_next_law) we can move to letting the
FSL LAW: Add new interface to use the last free LAW
Sergei Poselenov (7):
Socrates: config file cleanup.
Added the upmconfig() function for 85xx.
Socrates: Added FPGA mapping. LAWs and TLBs cleanup.
Socrates: added missed file with UPMA configuration data.
NAND: Added support for 128-bit OOB, adapted
Socrates: NAND support added. Changed the U-Boot base address and
Socrates: Added FPGA base address update in FDT.
Wolfgang Grandegger (16):
83xx/85xx/86xx: add more MxMR local bus definitions
TQM: move TQM boards to board/tqc
PPC: add accessor macros to clear and set bits in one shot
MPC85xx: Beautify boot output of L2 cache configuration
NAND FSL UPM: driver re-write using the hwcontrol callback
TQM85xx: Various coding style fixes
TQM85xx: Fix CPM port pin configuration
TQM85xx: Support for Spansion 'N' type flashes added
TQM85xx: Fix chip select configuration for second FLASH bank
TQM85xx: Bugfix in the SDRAM initialisation
TQM85xx: Support for Intel 82527 compatible CAN controller
TQM85xx: Support for Flat Device Tree
TQM8548: Basic support for the TQM8548 modules
TQM8548: PCI express support
TQM85xx: NAND support via local bus UPMB
TQM85xx: Change memory map to support Flash memory > 128 MiB
MAKEALL | 1 +
Makefile | 34 +-
board/atum8548/law.c | 14 +-
board/freescale/mpc8540ads/law.c | 10 +-
board/freescale/mpc8540ads/mpc8540ads.c | 42 --
board/freescale/mpc8541cds/law.c | 10 +-
board/freescale/mpc8541cds/mpc8541cds.c | 44 --
board/freescale/mpc8544ds/law.c | 16 +-
board/freescale/mpc8544ds/mpc8544ds.c | 44 --
board/freescale/mpc8548cds/law.c | 16 +-
board/freescale/mpc8548cds/mpc8548cds.c | 44 --
board/freescale/mpc8555cds/law.c | 10 +-
board/freescale/mpc8555cds/mpc8555cds.c | 44 --
board/freescale/mpc8560ads/law.c | 10 +-
board/freescale/mpc8560ads/mpc8560ads.c | 42 --
board/freescale/mpc8568mds/law.c | 12 +-
board/freescale/mpc8568mds/mpc8568mds.c | 39 --
board/freescale/mpc8610hpcd/law.c | 18 +-
board/freescale/mpc8641hpcn/law.c | 18 +-
board/mpc8540eval/law.c | 6 +-
board/pm854/law.c | 10 +-
board/pm856/law.c | 10 +-
board/sbc8548/law.c | 8 +-
board/sbc8560/law.c | 6 +-
board/sbc8641d/law.c | 18 +-
board/socrates/Makefile | 2 +-
board/socrates/config.mk | 3 +-
board/socrates/law.c | 21 +-
board/socrates/nand.c | 218 ++++++++
board/socrates/socrates.c | 22 +-
board/socrates/tlb.c | 25 +-
board/socrates/upm_table.h | 55 ++
board/stxgp3/law.c | 10 +-
board/stxssa/law.c | 12 +-
board/{ => tqc}/tqm5200/Makefile | 0
board/{ => tqc}/tqm5200/cam5200_flash.c | 0
board/{ => tqc}/tqm5200/cmd_stk52xx.c | 0
board/{ => tqc}/tqm5200/cmd_tb5200.c | 0
board/{ => tqc}/tqm5200/config.mk | 0
board/{ => tqc}/tqm5200/mt48lc16m16a2-75.h | 0
board/{ => tqc}/tqm5200/tqm5200.c | 0
board/{ => tqc}/tqm8260/Makefile | 0
board/{ => tqc}/tqm8260/config.mk | 0
board/{ => tqc}/tqm8260/flash.c | 0
board/{ => tqc}/tqm8260/tqm8260.c | 0
board/{ => tqc}/tqm8272/Makefile | 0
board/{ => tqc}/tqm8272/config.mk | 0
board/{ => tqc}/tqm8272/tqm8272.c | 0
board/{ => tqc}/tqm834x/Makefile | 0
board/{ => tqc}/tqm834x/config.mk | 0
board/{ => tqc}/tqm834x/pci.c | 0
board/{ => tqc}/tqm834x/tqm834x.c | 0
board/{ => tqc}/tqm85xx/Makefile | 8 +-
board/{ => tqc}/tqm85xx/config.mk | 0
board/tqc/tqm85xx/law.c | 86 +++
board/tqc/tqm85xx/nand.c | 469 ++++++++++++++++
board/tqc/tqm85xx/sdram.c | 371 +++++++++++++
board/tqc/tqm85xx/tlb.c | 248 +++++++++
board/tqc/tqm85xx/tqm85xx.c | 744 ++++++++++++++++++++++++++
board/{ => tqc}/tqm85xx/u-boot.lds | 0
board/{ => tqc}/tqm8xx/Makefile | 0
board/{ => tqc}/tqm8xx/config.mk | 0
board/{ => tqc}/tqm8xx/flash.c | 0
board/{ => tqc}/tqm8xx/load_sernum_ethaddr.c | 0
board/{ => tqc}/tqm8xx/tqm8xx.c | 0
board/{ => tqc}/tqm8xx/u-boot.lds | 0
board/{ => tqc}/tqm8xx/u-boot.lds.debug | 0
board/tqm85xx/law.c | 54 --
board/tqm85xx/sdram.c | 223 --------
board/tqm85xx/tlb.c | 114 ----
board/tqm85xx/tqm85xx.c | 419 ---------------
cpu/mpc85xx/cpu.c | 152 ++++--
cpu/mpc85xx/cpu_init.c | 39 +-
cpu/mpc85xx/fdt.c | 128 +++++
cpu/mpc85xx/spd_sdram.c | 2 +-
cpu/mpc85xx/traps.c | 8 +-
cpu/mpc86xx/cpu_init.c | 3 -
cpu/mpc86xx/spd_sdram.c | 6 +-
drivers/input/ps2ser.c | 31 +-
drivers/misc/fsl_law.c | 65 ++-
drivers/mtd/nand/fsl_upm.c | 128 ++---
drivers/mtd/nand/nand_base.c | 46 ++-
include/asm-ppc/fsl_law.h | 5 +
include/asm-ppc/fsl_lbc.h | 301 +++++++++++
include/asm-ppc/global_data.h | 3 +
include/asm-ppc/io.h | 36 ++
include/asm-ppc/processor.h | 11 +
include/configs/MPC8315ERDB.h | 2 +-
include/configs/MPC8349EMDS.h | 2 +-
include/configs/MPC8349ITX.h | 4 +-
include/configs/MPC8360EMDS.h | 2 +-
include/configs/MPC8360ERDK.h | 2 +-
include/configs/MPC837XEMDS.h | 2 +-
include/configs/MPC8540ADS.h | 3 -
include/configs/MPC8541CDS.h | 3 -
include/configs/MPC8544DS.h | 6 +-
include/configs/MPC8548CDS.h | 3 -
include/configs/MPC8555CDS.h | 3 -
include/configs/MPC8560ADS.h | 3 -
include/configs/MPC8568MDS.h | 1 -
include/configs/TQM834x.h | 2 +-
include/configs/TQM85xx.h | 380 +++++++++++---
include/configs/socrates.h | 29 +-
include/linux/mtd/fsl_upm.h | 1 -
include/linux/mtd/mtd-abi.h | 2 +-
include/mpc83xx.h | 234 +--------
include/mpc85xx.h | 37 +--
include/mpc86xx.h | 2 +
lib_ppc/board.c | 3 +-
109 files changed, 3488 insertions(+), 1832 deletions(-)
create mode 100644 board/socrates/nand.c
create mode 100644 board/socrates/upm_table.h
rename board/{ => tqc}/tqm5200/Makefile (100%)
rename board/{ => tqc}/tqm5200/cam5200_flash.c (100%)
rename board/{ => tqc}/tqm5200/cmd_stk52xx.c (100%)
rename board/{ => tqc}/tqm5200/cmd_tb5200.c (100%)
rename board/{ => tqc}/tqm5200/config.mk (100%)
rename board/{ => tqc}/tqm5200/mt48lc16m16a2-75.h (100%)
rename board/{ => tqc}/tqm5200/tqm5200.c (100%)
rename board/{ => tqc}/tqm8260/Makefile (100%)
rename board/{ => tqc}/tqm8260/config.mk (100%)
rename board/{ => tqc}/tqm8260/flash.c (100%)
rename board/{ => tqc}/tqm8260/tqm8260.c (100%)
rename board/{ => tqc}/tqm8272/Makefile (100%)
rename board/{ => tqc}/tqm8272/config.mk (100%)
rename board/{ => tqc}/tqm8272/tqm8272.c (100%)
rename board/{ => tqc}/tqm834x/Makefile (100%)
rename board/{ => tqc}/tqm834x/config.mk (100%)
rename board/{ => tqc}/tqm834x/pci.c (100%)
rename board/{ => tqc}/tqm834x/tqm834x.c (100%)
rename board/{ => tqc}/tqm85xx/Makefile (91%)
rename board/{ => tqc}/tqm85xx/config.mk (100%)
create mode 100644 board/tqc/tqm85xx/law.c
create mode 100644 board/tqc/tqm85xx/nand.c
create mode 100644 board/tqc/tqm85xx/sdram.c
create mode 100644 board/tqc/tqm85xx/tlb.c
create mode 100644 board/tqc/tqm85xx/tqm85xx.c
rename board/{ => tqc}/tqm85xx/u-boot.lds (100%)
rename board/{ => tqc}/tqm8xx/Makefile (100%)
rename board/{ => tqc}/tqm8xx/config.mk (100%)
rename board/{ => tqc}/tqm8xx/flash.c (100%)
rename board/{ => tqc}/tqm8xx/load_sernum_ethaddr.c (100%)
rename board/{ => tqc}/tqm8xx/tqm8xx.c (100%)
rename board/{ => tqc}/tqm8xx/u-boot.lds (100%)
rename board/{ => tqc}/tqm8xx/u-boot.lds.debug (100%)
delete mode 100644 board/tqm85xx/law.c
delete mode 100644 board/tqm85xx/sdram.c
delete mode 100644 board/tqm85xx/tlb.c
delete mode 100644 board/tqm85xx/tqm85xx.c
create mode 100644 include/asm-ppc/fsl_lbc.h
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot-Users] Please pull u-boot-mpc85xx.git
@ 2008-05-07 22:02 Andy Fleming
2008-05-09 22:18 ` Wolfgang Denk
0 siblings, 1 reply; 33+ messages in thread
From: Andy Fleming @ 2008-05-07 22:02 UTC (permalink / raw)
To: u-boot
are available in the git repository at:
git://www.denx.de/git/u-boot-mpc85xx.git master
Andy Fleming (1):
85xx: Limit CPU2 workaround to parts that have the errata
board/freescale/mpc8548cds/mpc8548cds.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot-Users] Please pull u-boot-mpc85xx.git
2008-05-07 22:02 Andy Fleming
@ 2008-05-09 22:18 ` Wolfgang Denk
0 siblings, 0 replies; 33+ messages in thread
From: Wolfgang Denk @ 2008-05-09 22:18 UTC (permalink / raw)
To: u-boot
In message <1210197752-31274-1-git-send-email-afleming@freescale.com> you wrote:
> are available in the git repository at:
>
> git://www.denx.de/git/u-boot-mpc85xx.git master
>
> Andy Fleming (1):
> 85xx: Limit CPU2 workaround to parts that have the errata
>
> board/freescale/mpc8548cds/mpc8548cds.c | 7 ++++++-
> 1 files changed, 6 insertions(+), 1 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The human race has one really effective weapon, and that is laughter.
- Mark Twain
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot-Users] Please pull u-boot-mpc85xx.git
@ 2008-04-29 16:48 Andy Fleming
2008-04-29 18:05 ` Wolfgang Denk
0 siblings, 1 reply; 33+ messages in thread
From: Andy Fleming @ 2008-04-29 16:48 UTC (permalink / raw)
To: u-boot
are available in the git repository at:
git://www.denx.de/git/u-boot-mpc85xx.git master
Kumar Gala (3):
85xx: Additional fixes and cleanup of MP code
85xx/86xx: Rename DDR init address and init extended address register
85xx/86xx: Rename ext_refrec to timing_cfg_3 to match docs
You've already got the MP one, but the other two were just submitted.
board/freescale/mpc8610hpcd/mpc8610hpcd.c | 2 +-
board/freescale/mpc8641hpcn/mpc8641hpcn.c | 2 +-
board/sbc8548/sbc8548.c | 2 +-
board/sbc8641d/sbc8641d.c | 4 ++--
cpu/mpc85xx/mp.c | 6 +++++-
cpu/mpc85xx/release.S | 3 ++-
cpu/mpc85xx/spd_sdram.c | 4 ++--
cpu/mpc86xx/spd_sdram.c | 4 ++--
include/asm-ppc/immap_85xx.h | 6 +++---
include/asm-ppc/immap_86xx.h | 4 ++--
include/configs/MPC8610HPCD.h | 2 +-
include/configs/sbc8641d.h | 2 +-
12 files changed, 23 insertions(+), 18 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot-Users] Please pull u-boot-mpc85xx.git
2008-04-29 16:48 Andy Fleming
@ 2008-04-29 18:05 ` Wolfgang Denk
0 siblings, 0 replies; 33+ messages in thread
From: Wolfgang Denk @ 2008-04-29 18:05 UTC (permalink / raw)
To: u-boot
In message <1209487737-20612-1-git-send-email-afleming@freescale.com> you wrote:
> are available in the git repository at:
>
> git://www.denx.de/git/u-boot-mpc85xx.git master
>
> Kumar Gala (3):
> 85xx: Additional fixes and cleanup of MP code
> 85xx/86xx: Rename DDR init address and init extended address register
> 85xx/86xx: Rename ext_refrec to timing_cfg_3 to match docs
>
> You've already got the MP one, but the other two were just submitted.
>
> board/freescale/mpc8610hpcd/mpc8610hpcd.c | 2 +-
> board/freescale/mpc8641hpcn/mpc8641hpcn.c | 2 +-
> board/sbc8548/sbc8548.c | 2 +-
> board/sbc8641d/sbc8641d.c | 4 ++--
> cpu/mpc85xx/mp.c | 6 +++++-
> cpu/mpc85xx/release.S | 3 ++-
> cpu/mpc85xx/spd_sdram.c | 4 ++--
> cpu/mpc86xx/spd_sdram.c | 4 ++--
> include/asm-ppc/immap_85xx.h | 6 +++---
> include/asm-ppc/immap_86xx.h | 4 ++--
> include/configs/MPC8610HPCD.h | 2 +-
> include/configs/sbc8641d.h | 2 +-
> 12 files changed, 23 insertions(+), 18 deletions(-)
Done, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Witch! Witch! They'll burn ya!
-- Hag, "Tomorrow is Yesterday", stardate unknown
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot-Users] Please pull u-boot-mpc85xx.git
@ 2008-04-29 14:44 Andy Fleming
2008-04-29 14:59 ` Wolfgang Denk
0 siblings, 1 reply; 33+ messages in thread
From: Andy Fleming @ 2008-04-29 14:44 UTC (permalink / raw)
To: u-boot
are available in the git repository at:
git://www.denx.de/git/u-boot-mpc85xx.git master
Kumar Gala (1):
85xx: Additional fixes and cleanup of MP code
cpu/mpc85xx/mp.c | 6 +++++-
cpu/mpc85xx/release.S | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot-Users] Please pull u-boot-mpc85xx.git
2008-04-29 14:44 Andy Fleming
@ 2008-04-29 14:59 ` Wolfgang Denk
0 siblings, 0 replies; 33+ messages in thread
From: Wolfgang Denk @ 2008-04-29 14:59 UTC (permalink / raw)
To: u-boot
In message <1209480290-19438-1-git-send-email-afleming@freescale.com> you wrote:
> are available in the git repository at:
>
> git://www.denx.de/git/u-boot-mpc85xx.git master
>
> Kumar Gala (1):
> 85xx: Additional fixes and cleanup of MP code
>
> cpu/mpc85xx/mp.c | 6 +++++-
> cpu/mpc85xx/release.S | 3 ++-
> 2 files changed, 7 insertions(+), 2 deletions(-)
Done. Thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Sex is like air. It's only a big deal if you can't get any.
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot-Users] Please pull u-boot-mpc85xx.git
@ 2008-04-21 18:04 Andy Fleming
2008-04-24 12:41 ` Kumar Gala
2008-04-24 13:30 ` Wolfgang Denk
0 siblings, 2 replies; 33+ messages in thread
From: Andy Fleming @ 2008-04-21 18:04 UTC (permalink / raw)
To: u-boot
are available in the git repository at:
git://www.denx.de/git/u-boot-mpc85xx.git master
Kumar Gala (1):
85xx: Fix size of cpu-release-addr property
Timur Tabi (1):
Fix calculation of I2C clock for some 85xx chips
cpu/mpc85xx/fdt.c | 2 +-
cpu/mpc85xx/speed.c | 31 ++++++++++++++++++++++++++++++-
include/asm-ppc/immap_85xx.h | 4 +++-
3 files changed, 34 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot-Users] Please pull u-boot-mpc85xx.git
2008-04-21 18:04 Andy Fleming
@ 2008-04-24 12:41 ` Kumar Gala
2008-04-24 13:31 ` Wolfgang Denk
2008-04-24 13:30 ` Wolfgang Denk
1 sibling, 1 reply; 33+ messages in thread
From: Kumar Gala @ 2008-04-24 12:41 UTC (permalink / raw)
To: u-boot
On Apr 21, 2008, at 1:04 PM, Andy Fleming wrote:
> are available in the git repository at:
>
> git://www.denx.de/git/u-boot-mpc85xx.git master
>
> Kumar Gala (1):
> 85xx: Fix size of cpu-release-addr property
>
> Timur Tabi (1):
> Fix calculation of I2C clock for some 85xx chips
>
> cpu/mpc85xx/fdt.c | 2 +-
> cpu/mpc85xx/speed.c | 31 ++++++++++++++++++++++++++++++-
> include/asm-ppc/immap_85xx.h | 4 +++-
> 3 files changed, 34 insertions(+), 3 deletions(-)
Wolfgang,
reminder to pull this if its ok.
- k
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot-Users] Please pull u-boot-mpc85xx.git
2008-04-24 12:41 ` Kumar Gala
@ 2008-04-24 13:31 ` Wolfgang Denk
0 siblings, 0 replies; 33+ messages in thread
From: Wolfgang Denk @ 2008-04-24 13:31 UTC (permalink / raw)
To: u-boot
In message <BABB963C-D453-4254-B8FD-5B1EAEC468B7@kernel.crashing.org> you wrote:
>
> On Apr 21, 2008, at 1:04 PM, Andy Fleming wrote:
> > are available in the git repository at:
> >
> > git://www.denx.de/git/u-boot-mpc85xx.git master
> >
> > Kumar Gala (1):
> > 85xx: Fix size of cpu-release-addr property
> >
> > Timur Tabi (1):
> > Fix calculation of I2C clock for some 85xx chips
> >
> > cpu/mpc85xx/fdt.c | 2 +-
> > cpu/mpc85xx/speed.c | 31 ++++++++++++++++++++++++++++++-
> > include/asm-ppc/immap_85xx.h | 4 +++-
> > 3 files changed, 34 insertions(+), 3 deletions(-)
>
> Wolfgang,
>
> reminder to pull this if its ok.
That was less than 3 days ago. Sorry, I'm not that fast...
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
No journaling file system can recover your data if the disk dies.
- Steve Rago in <D4Cw1p.L9E@plc.com>
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot-Users] Please pull u-boot-mpc85xx.git
2008-04-21 18:04 Andy Fleming
2008-04-24 12:41 ` Kumar Gala
@ 2008-04-24 13:30 ` Wolfgang Denk
1 sibling, 0 replies; 33+ messages in thread
From: Wolfgang Denk @ 2008-04-24 13:30 UTC (permalink / raw)
To: u-boot
In message <1208801067-307-1-git-send-email-afleming@freescale.com> you wrote:
> are available in the git repository at:
>
> git://www.denx.de/git/u-boot-mpc85xx.git master
>
> Kumar Gala (1):
> 85xx: Fix size of cpu-release-addr property
>
> Timur Tabi (1):
> Fix calculation of I2C clock for some 85xx chips
>
> cpu/mpc85xx/fdt.c | 2 +-
> cpu/mpc85xx/speed.c | 31 ++++++++++++++++++++++++++++++-
> include/asm-ppc/immap_85xx.h | 4 +++-
> 3 files changed, 34 insertions(+), 3 deletions(-)
Done, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The price of curiosity is a terminal experience.
- Terry Pratchett, _The Dark Side of the Sun_
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot-Users] Please pull u-boot-mpc85xx.git
@ 2008-04-18 22:49 Andy Fleming
2008-04-20 23:33 ` Wolfgang Denk
0 siblings, 1 reply; 33+ messages in thread
From: Andy Fleming @ 2008-04-18 22:49 UTC (permalink / raw)
To: u-boot
are available in the git repository at:
git://www.denx.de/git/u-boot-mpc85xx.git master
Kumar Gala (2):
85xx: Fix size of cpu-release-addr property
85xx: Round up frequency calculations to get reasonable output
Timur Tabi (1):
Fix calculation of I2C clock for some 85xx chips
cpu/mpc85xx/cpu.c | 18 +++++++++++-------
cpu/mpc85xx/fdt.c | 2 +-
cpu/mpc85xx/speed.c | 31 ++++++++++++++++++++++++++++++-
include/asm-ppc/immap_85xx.h | 4 +++-
4 files changed, 45 insertions(+), 10 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot-Users] Please pull u-boot-mpc85xx.git
2008-04-18 22:49 Andy Fleming
@ 2008-04-20 23:33 ` Wolfgang Denk
0 siblings, 0 replies; 33+ messages in thread
From: Wolfgang Denk @ 2008-04-20 23:33 UTC (permalink / raw)
To: u-boot
In message <1208558956-6531-1-git-send-email-afleming@freescale.com> you wrote:
> are available in the git repository at:
>
> git://www.denx.de/git/u-boot-mpc85xx.git master
>
> Kumar Gala (2):
> 85xx: Fix size of cpu-release-addr property
> 85xx: Round up frequency calculations to get reasonable output
>
> Timur Tabi (1):
> Fix calculation of I2C clock for some 85xx chips
Sory, can't pull because of the "Round up" patch that was NAKed.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The use of Microsoft crippleware systems is a sin that carries with
it its own punishment.
-- Tom Christiansen in <6bo3fr$pj8$5@csnews.cs.colorado.edu>
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot-Users] Please pull u-boot-mpc85xx.git
@ 2008-04-11 22:40 Andy Fleming
2008-04-13 17:17 ` Wolfgang Denk
0 siblings, 1 reply; 33+ messages in thread
From: Andy Fleming @ 2008-04-11 22:40 UTC (permalink / raw)
To: u-boot
are available in the git repository at:
git://www.denx.de/git/u-boot-mpc85xx.git master
Kumar Gala (2):
85xx: Use SVR_SOC_VER instead of SVR_VER
85xx: Fix detection of MP cpu spin up
cpu/mpc85xx/cpu_init.c | 2 +-
cpu/mpc85xx/mp.c | 6 +++++-
cpu/mpc85xx/spd_sdram.c | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot-Users] Please pull u-boot-mpc85xx.git
2008-04-11 22:40 Andy Fleming
@ 2008-04-13 17:17 ` Wolfgang Denk
0 siblings, 0 replies; 33+ messages in thread
From: Wolfgang Denk @ 2008-04-13 17:17 UTC (permalink / raw)
To: u-boot
In message <1207953631-11391-1-git-send-email-afleming@freescale.com> you wrote:
>
> git://www.denx.de/git/u-boot-mpc85xx.git master
>
> Kumar Gala (2):
> 85xx: Use SVR_SOC_VER instead of SVR_VER
> 85xx: Fix detection of MP cpu spin up
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Never worry about theory as long as the machinery does what it's
supposed to do. - R. A. Heinlein
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot-Users] Please pull u-boot-mpc85xx.git
@ 2008-03-26 17:03 Andy Fleming
2008-03-26 23:17 ` Wolfgang Denk
0 siblings, 1 reply; 33+ messages in thread
From: Andy Fleming @ 2008-03-26 17:03 UTC (permalink / raw)
To: u-boot
are available in the git repository at:
git://www.denx.de/git/u-boot-mpc85xx.git master
Andy Fleming (2):
Add the Freescale PCI device IDs
Update SVR numbers to expand support
James Yang (4):
85xx: get_tbclk() speed up and rounding fix
85xx: Show DDR memory data rate in addition to the memory clock frequency.
85xx: Speed up get_ddr_freq() and get_bus_freq()
85xx: Expand CCSR space with more DDR controller registers.
Jon Loeliger (1):
FSL: Clean up board/freescale/common/Makefile
Kumar Gala (6):
85xx: Add the concept of CFG_CCSRBAR_PHYS
85xx: Added support for multicore boot mechanism
85xx: Added support for multicore boot mechanism
85xx: Fix merge duplication
85xx: Update multicore boot mechanism to ePAPR v0.81 spec
85xx: Add cpu_mp_lmb_reserve helper to reserve boot page
board/atum8548/tlb.c | 2 +-
board/freescale/common/Makefile | 12 +-
board/freescale/common/{eeprom.c => cds_eeprom.c} | 0
.../freescale/common/{ft_board.c => cds_pci_ft.c} | 0
board/freescale/common/{via.c => cds_via.c} | 0
board/freescale/mpc8540ads/tlb.c | 2 +-
board/freescale/mpc8541cds/Makefile | 17 +-
board/freescale/mpc8541cds/tlb.c | 2 +-
board/freescale/mpc8544ds/tlb.c | 2 +-
board/freescale/mpc8548cds/Makefile | 17 +-
board/freescale/mpc8548cds/tlb.c | 2 +-
board/freescale/mpc8555cds/Makefile | 17 +-
board/freescale/mpc8555cds/tlb.c | 2 +-
board/freescale/mpc8560ads/tlb.c | 2 +-
board/freescale/mpc8568mds/Makefile | 3 -
board/freescale/mpc8568mds/tlb.c | 2 +-
board/freescale/mpc8610hpcd/Makefile | 4 -
board/mpc8540eval/tlb.c | 2 +-
board/pm854/tlb.c | 2 +-
board/pm856/tlb.c | 2 +-
board/sbc8548/tlb.c | 2 +-
board/sbc8560/tlb.c | 2 +-
board/stxgp3/tlb.c | 2 +-
board/stxssa/tlb.c | 2 +-
board/tqm85xx/tlb.c | 2 +-
common/Makefile | 1 +
common/cmd_mp.c | 93 +++++++++
cpu/mpc85xx/Makefile | 3 +
cpu/mpc85xx/cpu.c | 102 ++++++-----
cpu/mpc85xx/cpu_init.c | 10 +-
cpu/mpc85xx/fdt.c | 52 +++++
cpu/mpc85xx/mp.c | 210 ++++++++++++++++++++
cpu/mpc85xx/mp.h | 20 ++
cpu/mpc85xx/release.S | 182 +++++++++++++++++
cpu/mpc85xx/speed.c | 21 +--
cpu/mpc86xx/cpu.c | 2 +-
include/asm-ppc/global_data.h | 2 -
include/asm-ppc/immap_85xx.h | 29 +++-
include/asm-ppc/processor.h | 44 +++--
include/common.h | 7 +
include/configs/ATUM8548.h | 1 +
include/configs/MPC8540ADS.h | 1 +
include/configs/MPC8540EVAL.h | 1 +
include/configs/MPC8541CDS.h | 6 +
include/configs/MPC8544DS.h | 1 +
include/configs/MPC8548CDS.h | 6 +
include/configs/MPC8555CDS.h | 6 +
include/configs/MPC8560ADS.h | 1 +
include/configs/MPC8568MDS.h | 1 +
include/configs/PM854.h | 1 +
include/configs/PM856.h | 1 +
include/configs/SBC8540.h | 1 +
include/configs/TQM85xx.h | 1 +
include/configs/sbc8548.h | 1 +
include/configs/sbc8560.h | 1 +
include/configs/stxgp3.h | 1 +
include/configs/stxssa.h | 1 +
include/pci_ids.h | 23 +++
58 files changed, 794 insertions(+), 141 deletions(-)
rename board/freescale/common/{eeprom.c => cds_eeprom.c} (100%)
rename board/freescale/common/{ft_board.c => cds_pci_ft.c} (100%)
rename board/freescale/common/{via.c => cds_via.c} (100%)
create mode 100644 common/cmd_mp.c
create mode 100644 cpu/mpc85xx/mp.c
create mode 100644 cpu/mpc85xx/mp.h
create mode 100644 cpu/mpc85xx/release.S
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot-Users] Please pull u-boot-mpc85xx.git
2008-03-26 17:03 Andy Fleming
@ 2008-03-26 23:17 ` Wolfgang Denk
0 siblings, 0 replies; 33+ messages in thread
From: Wolfgang Denk @ 2008-03-26 23:17 UTC (permalink / raw)
To: u-boot
In message <1206551019-24699-1-git-send-email-afleming@freescale.com> you wrote:
> are available in the git repository at:
>
> git://www.denx.de/git/u-boot-mpc85xx.git master
>
> Andy Fleming (2):
> Add the Freescale PCI device IDs
> Update SVR numbers to expand support
>
> James Yang (4):
> 85xx: get_tbclk() speed up and rounding fix
> 85xx: Show DDR memory data rate in addition to the memory clock frequency.
> 85xx: Speed up get_ddr_freq() and get_bus_freq()
> 85xx: Expand CCSR space with more DDR controller registers.
>
> Jon Loeliger (1):
> FSL: Clean up board/freescale/common/Makefile
>
> Kumar Gala (6):
> 85xx: Add the concept of CFG_CCSRBAR_PHYS
> 85xx: Added support for multicore boot mechanism
> 85xx: Added support for multicore boot mechanism
> 85xx: Fix merge duplication
> 85xx: Update multicore boot mechanism to ePAPR v0.81 spec
> 85xx: Add cpu_mp_lmb_reserve helper to reserve boot page
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Things are not as simple as they seem at first. - Edward Thorp
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot-Users] Please pull u-boot-mpc85xx.git
@ 2008-02-27 23:06 Andy Fleming
2008-03-02 20:50 ` Wolfgang Denk
0 siblings, 1 reply; 33+ messages in thread
From: Andy Fleming @ 2008-02-27 23:06 UTC (permalink / raw)
To: u-boot
Argh. I didn't notice the last one was somewhat malformed. The newer git
"helpfully" checks the remote to make sure this request is sensible, and
failed due to the corporate firewall. Anyway, I've solved the problem in
my script, and these patches fix the known problems with 85xx in rc2.
The following changes since commit b29661fc1151077776454288051bc9a488351ce8:
Wolfgang Denk (1):
Coding style cleanup. Prepare v1.3.2-rc2 release candidate
are available in the git repository at:
git://www.denx.de/git/u-boot-mpc85xx.git master
Andy Fleming (2):
Invalidate INIT_RAM TLB mappings
Fix source for ECM error IVPR
Jean-Christophe PLAGNIOL-VILLARD (2):
sbc8548: Fix cfi flash bank declaration
sbc8548: Fix Revision reading and unused variable 'path'
Kumar Gala (1):
85xx: Don't icbi when unlocking the cache
board/sbc8548/sbc8548.c | 6 ++++--
cpu/mpc85xx/interrupts.c | 2 +-
cpu/mpc85xx/start.S | 18 +++++++++++++-----
include/configs/sbc8548.h | 2 +-
4 files changed, 19 insertions(+), 9 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot-Users] Please pull u-boot-mpc85xx.git
2008-02-27 23:06 Andy Fleming
@ 2008-03-02 20:50 ` Wolfgang Denk
0 siblings, 0 replies; 33+ messages in thread
From: Wolfgang Denk @ 2008-03-02 20:50 UTC (permalink / raw)
To: u-boot
In message <1204153579-9960-1-git-send-email-afleming@freescale.com> you wrote:
> Argh. I didn't notice the last one was somewhat malformed. The newer git
> "helpfully" checks the remote to make sure this request is sensible, and
> failed due to the corporate firewall. Anyway, I've solved the problem in
> my script, and these patches fix the known problems with 85xx in rc2.
...and I didn't read the 2nd message before replying. Sorry.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
To live is always desirable.
-- Eleen the Capellan, "Friday's Child", stardate 3498.9
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot-Users] Please pull u-boot-mpc85xx.git
@ 2008-02-27 23:00 Andy Fleming
2008-03-02 20:47 ` Wolfgang Denk
0 siblings, 1 reply; 33+ messages in thread
From: Andy Fleming @ 2008-02-27 23:00 UTC (permalink / raw)
To: u-boot
are available in the git repository at:
git://www.denx.de/git/u-boot-mpc85xx.git ..BRANCH.NOT.VERIFIED..
Andy Fleming (2):
Invalidate INIT_RAM TLB mappings
Fix source for ECM error IVPR
Jean-Christophe PLAGNIOL-VILLARD (2):
sbc8548: Fix cfi flash bank declaration
sbc8548: Fix Revision reading and unused variable 'path'
Kumar Gala (1):
85xx: Don't icbi when unlocking the cache
board/sbc8548/sbc8548.c | 6 ++++--
cpu/mpc85xx/interrupts.c | 2 +-
cpu/mpc85xx/start.S | 18 +++++++++++++-----
include/configs/sbc8548.h | 2 +-
4 files changed, 19 insertions(+), 9 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot-Users] Please pull u-boot-mpc85xx.git
2008-02-27 23:00 Andy Fleming
@ 2008-03-02 20:47 ` Wolfgang Denk
0 siblings, 0 replies; 33+ messages in thread
From: Wolfgang Denk @ 2008-03-02 20:47 UTC (permalink / raw)
To: u-boot
In message <1204153236-9869-1-git-send-email-afleming@freescale.com> you wrote:
> are available in the git repository at:
>
> git://www.denx.de/git/u-boot-mpc85xx.git ..BRANCH.NOT.VERIFIED..
Hmmm... Could you please be a bit more specific about which branch to
use? For now I'll assume "master" ...
> Andy Fleming (2):
> Invalidate INIT_RAM TLB mappings
> Fix source for ECM error IVPR
>
> Jean-Christophe PLAGNIOL-VILLARD (2):
> sbc8548: Fix cfi flash bank declaration
> sbc8548: Fix Revision reading and unused variable 'path'
>
> Kumar Gala (1):
> 85xx: Don't icbi when unlocking the cache
>
> board/sbc8548/sbc8548.c | 6 ++++--
> cpu/mpc85xx/interrupts.c | 2 +-
> cpu/mpc85xx/start.S | 18 +++++++++++++-----
> include/configs/sbc8548.h | 2 +-
> 4 files changed, 19 insertions(+), 9 deletions(-)
Done, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
How can you tell when sour cream goes bad?
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot-Users] Please pull u-boot-mpc85xx.git
@ 2008-02-05 17:03 Andy Fleming
2008-02-14 23:18 ` Wolfgang Denk
0 siblings, 1 reply; 33+ messages in thread
From: Andy Fleming @ 2008-02-05 17:03 UTC (permalink / raw)
To: u-boot
are found in the git repository at:
git://www.denx.de/git/u-boot-mpc85xx.git
Kumar Gala (1):
QE: Move FDT support into a common file
Timur Tabi (1):
85xx,86xx: Determine I2C clock frequencies and store in global_data
common/fdt_support.c | 48 ----------------------
cpu/mpc83xx/fdt.c | 13 +-----
cpu/mpc85xx/fdt.c | 8 +--
cpu/mpc85xx/speed.c | 3 +
cpu/mpc86xx/speed.c | 2 +
drivers/qe/Makefile | 3 +-
drivers/qe/fdt.c | 90 +++++++++++++++++++++++++++++++++++++++++
drivers/qe/qe.h | 1 +
include/asm-ppc/global_data.h | 6 ++-
9 files changed, 108 insertions(+), 66 deletions(-)
create mode 100644 drivers/qe/fdt.c
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot-Users] Please pull u-boot-mpc85xx.git
2008-02-05 17:03 Andy Fleming
@ 2008-02-14 23:18 ` Wolfgang Denk
0 siblings, 0 replies; 33+ messages in thread
From: Wolfgang Denk @ 2008-02-14 23:18 UTC (permalink / raw)
To: u-boot
In message <12022310343973-git-send-email-afleming@freescale.com> you wrote:
> are found in the git repository at:
>
> git://www.denx.de/git/u-boot-mpc85xx.git
>
> Kumar Gala (1):
> QE: Move FDT support into a common file
>
> Timur Tabi (1):
> 85xx,86xx: Determine I2C clock frequencies and store in global_data
Got all of this, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
In any group of employed individuals the only naturally early riser
is _always_ the office manager, who will _always_ leave reproachful
little notes ... on the desks of their subordinates.
- Terry Pratchett, _Lords and Ladies_
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot-Users] Please pull u-boot-mpc85xx.git
@ 2008-02-05 0:57 Andy Fleming
2008-02-14 23:13 ` Wolfgang Denk
0 siblings, 1 reply; 33+ messages in thread
From: Andy Fleming @ 2008-02-05 0:57 UTC (permalink / raw)
To: u-boot
are found in the git repository at:
git://www.denx.de/git/u-boot-mpc85xx.git
Timur Tabi (1):
85xx,86xx: Determine I2C clock frequencies and store in global_data
cpu/mpc85xx/speed.c | 3 +++
cpu/mpc86xx/speed.c | 2 ++
include/asm-ppc/global_data.h | 6 ++++--
3 files changed, 9 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot-Users] Please pull u-boot-mpc85xx.git
2008-02-05 0:57 Andy Fleming
@ 2008-02-14 23:13 ` Wolfgang Denk
0 siblings, 0 replies; 33+ messages in thread
From: Wolfgang Denk @ 2008-02-14 23:13 UTC (permalink / raw)
To: u-boot
In message <12021730643410-git-send-email-afleming@freescale.com> you wrote:
> are found in the git repository at:
>
> git://www.denx.de/git/u-boot-mpc85xx.git
>
> Timur Tabi (1):
> 85xx,86xx: Determine I2C clock frequencies and store in global_data
Done (already got that). Thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
We are Microsoft. Unix is irrelevant. Openness is futile. Prepare to
be assimilated.
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot-Users] Please pull u-boot-mpc85xx.git
@ 2008-01-09 17:15 Andy Fleming
2008-01-09 21:47 ` Wolfgang Denk
0 siblings, 1 reply; 33+ messages in thread
From: Andy Fleming @ 2008-01-09 17:15 UTC (permalink / raw)
To: u-boot
The following changes since commit 74ac5facb988fc488a707db228b177ead63a6541:
Wolfgang Denk (1):
Merge branch 'inka4x0-ng' of /home/m8/git/u-boot/
are found in the git repository at:
git://www.denx.de/git/u-boot-mpc85xx.git
Andy Fleming (2):
Merge branch 'kumar'
Merge branch 'denx'
Anton Vorontsov (2):
MPC8568E-MDS: reset UCCs to use them reliably
MPC8568E-MDS: set up QE pario for UART1
Joe Hamman (2):
mpc85xx: Add support for SBC8548 (updated)
mpc85xx: Add support for SBC8548 (updated)
Kumar Gala (3):
Use FSL Book-E MMU macros from Linux Kernel
Reworked FSL Book-E TLB macros to be more readable
85xx: Remove cache config from configs.h
Timur Tabi (1):
85xx: add ability to upload QE firmware
robert lazarski (2):
mpc85xx: Add support for ATUM8548 (updated)
mpc85xx: Add support for ATUM8548 (updated)
MAINTAINERS | 5 +
MAKEALL | 2 +
Makefile | 6 +
board/atum8548/Makefile | 56 +++
board/atum8548/atum8548.c | 420 ++++++++++++++++++++++
board/atum8548/config.mk | 33 ++
board/atum8548/init.S | 235 +++++++++++++
board/atum8548/u-boot.lds | 147 ++++++++
board/freescale/mpc8540ads/init.S | 145 ++++-----
board/freescale/mpc8541cds/init.S | 124 +++----
board/freescale/mpc8544ds/init.S | 117 +++----
board/freescale/mpc8548cds/init.S | 109 +++----
board/freescale/mpc8555cds/init.S | 124 +++----
board/freescale/mpc8560ads/init.S | 144 ++++-----
board/freescale/mpc8568mds/bcsr.c | 21 ++
board/freescale/mpc8568mds/bcsr.h | 9 +
board/freescale/mpc8568mds/init.S | 104 +++---
board/freescale/mpc8568mds/mpc8568mds.c | 10 +
board/mpc8540eval/init.S | 132 ++++----
board/pm854/init.S | 124 +++----
board/pm856/init.S | 124 +++----
board/sbc8548/Makefile | 55 +++
board/sbc8548/config.mk | 32 ++
board/sbc8548/init.S | 241 +++++++++++++
board/sbc8548/sbc8548.c | 569 ++++++++++++++++++++++++++++++
board/sbc8548/u-boot.lds | 149 ++++++++
board/sbc8560/init.S | 94 +++---
board/stxgp3/init.S | 144 ++++-----
board/stxssa/init.S | 110 +++----
board/tqm85xx/init.S | 124 +++----
common/fdt_support.c | 48 +++
cpu/mpc85xx/fdt.c | 1 +
cpu/mpc85xx/spd_sdram.c | 23 +-
cpu/mpc85xx/start.S | 9 +-
doc/README.atum8548 | 29 ++
doc/README.sbc8548 | 27 ++
drivers/qe/qe.c | 219 ++++++++++++
drivers/qe/qe.h | 56 +++
include/asm-ppc/cache.h | 10 +-
include/asm-ppc/immap_qe.h | 33 ++-
include/asm-ppc/mmu.h | 113 ++++---
include/asm-ppc/processor.h | 4 +
include/configs/ATUM8548.h | 465 +++++++++++++++++++++++++
include/configs/MPC8540ADS.h | 7 -
include/configs/MPC8540EVAL.h | 7 -
include/configs/MPC8541CDS.h | 7 -
include/configs/MPC8544DS.h | 7 -
include/configs/MPC8548CDS.h | 7 -
include/configs/MPC8555CDS.h | 7 -
include/configs/MPC8560ADS.h | 7 -
include/configs/MPC8568MDS.h | 7 -
include/configs/MPC8641HPCN.h | 7 -
include/configs/PM854.h | 7 -
include/configs/PM856.h | 7 -
include/configs/SBC8540.h | 7 -
include/configs/TQM85xx.h | 7 -
include/configs/sbc8548.h | 576 +++++++++++++++++++++++++++++++
include/configs/sbc8560.h | 7 -
include/configs/stxgp3.h | 7 -
include/configs/stxssa.h | 7 -
include/e500.h | 94 -----
include/fdt_support.h | 1 +
62 files changed, 4320 insertions(+), 1209 deletions(-)
create mode 100644 board/atum8548/Makefile
create mode 100644 board/atum8548/atum8548.c
create mode 100644 board/atum8548/config.mk
create mode 100644 board/atum8548/init.S
create mode 100644 board/atum8548/u-boot.lds
create mode 100644 board/sbc8548/Makefile
create mode 100644 board/sbc8548/config.mk
create mode 100644 board/sbc8548/init.S
create mode 100644 board/sbc8548/sbc8548.c
create mode 100644 board/sbc8548/u-boot.lds
create mode 100644 doc/README.atum8548
create mode 100644 doc/README.sbc8548
create mode 100644 include/configs/ATUM8548.h
create mode 100644 include/configs/sbc8548.h
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot-Users] Please pull u-boot-mpc85xx.git
2008-01-09 17:15 Andy Fleming
@ 2008-01-09 21:47 ` Wolfgang Denk
2008-01-09 23:02 ` gvb.uboot
0 siblings, 1 reply; 33+ messages in thread
From: Wolfgang Denk @ 2008-01-09 21:47 UTC (permalink / raw)
To: u-boot
Dear Andy,
in message <Pine.LNX.4.61.0801091112540.1264@ld0175-tx32.am.freescale.net> you wrote:
> The following changes since commit 74ac5facb988fc488a707db228b177ead63a6541:
> Wolfgang Denk (1):
> Merge branch 'inka4x0-ng' of /home/m8/git/u-boot/
>
> are found in the git repository at:
>
> git://www.denx.de/git/u-boot-mpc85xx.git
>
> Andy Fleming (2):
> Merge branch 'kumar'
> Merge branch 'denx'
>
> Anton Vorontsov (2):
> MPC8568E-MDS: reset UCCs to use them reliably
> MPC8568E-MDS: set up QE pario for UART1
>
> Joe Hamman (2):
> mpc85xx: Add support for SBC8548 (updated)
> mpc85xx: Add support for SBC8548 (updated)
>
> Kumar Gala (3):
> Use FSL Book-E MMU macros from Linux Kernel
> Reworked FSL Book-E TLB macros to be more readable
> 85xx: Remove cache config from configs.h
>
> Timur Tabi (1):
> 85xx: add ability to upload QE firmware
>
> robert lazarski (2):
> mpc85xx: Add support for ATUM8548 (updated)
> mpc85xx: Add support for ATUM8548 (updated)
Sorry, can you please rebase your repo against current U-Boot? I get a
merge conflict for include/fdt_support.h ...
Auto-merged MAINTAINERS
Auto-merged MAKEALL
Auto-merged Makefile
Auto-merged common/fdt_support.c
Auto-merged include/fdt_support.h
CONFLICT (content): Merge conflict in include/fdt_support.h
Automatic merge failed; fix conflicts and then commit the result.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"And it should be the law: If you use the word `paradigm' without
knowing what the dictionary says it means, you go to jail. No
exceptions." - David Jones @ Megatest Corporation
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot-Users] Please pull u-boot-mpc85xx.git
2008-01-09 21:47 ` Wolfgang Denk
@ 2008-01-09 23:02 ` gvb.uboot
0 siblings, 0 replies; 33+ messages in thread
From: gvb.uboot @ 2008-01-09 23:02 UTC (permalink / raw)
To: u-boot
Wolfgang Denk wrote:
> Dear Andy,
>
> in message <Pine.LNX.4.61.0801091112540.1264@ld0175-tx32.am.freescale.net> you wrote:
>> The following changes since commit 74ac5facb988fc488a707db228b177ead63a6541:
>> Wolfgang Denk (1):
>> Merge branch 'inka4x0-ng' of /home/m8/git/u-boot/
[snip]
>
> Sorry, can you please rebase your repo against current U-Boot? I get a
> merge conflict for include/fdt_support.h ...
>
> Auto-merged MAINTAINERS
> Auto-merged MAKEALL
> Auto-merged Makefile
> Auto-merged common/fdt_support.c
> Auto-merged include/fdt_support.h
> CONFLICT (content): Merge conflict in include/fdt_support.h
> Automatic merge failed; fix conflicts and then commit the result.
This may be my fault if you are seeing the same thing as me. It looks
like I goofed up git when I redid a patch to delete the erroneous
embedded space (search for ^I ^I) in:
+ err = fdt_setprop(fdt, nodeoffset,
+ "linux,initrd-start", &tmp, sizeof(tmp));
The solution is to simply keep the line without the space, delete the
other line and the git merge marker lines.
Sorry for gumming up the merge,
gvb
^ permalink raw reply [flat|nested] 33+ messages in thread
end of thread, other threads:[~2008-07-15 19:37 UTC | newest]
Thread overview: 33+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-17 22:20 [U-Boot-Users] Please pull u-boot-mpc85xx.git Andy Fleming
2008-01-23 13:17 ` Wolfgang Denk
2008-01-23 15:46 ` Timur Tabi
-- strict thread matches above, loose matches on Subject: below --
2008-07-15 1:35 Andy Fleming
2008-07-15 19:37 ` Wolfgang Denk
2008-06-11 7:18 Andy Fleming
2008-05-07 22:02 Andy Fleming
2008-05-09 22:18 ` Wolfgang Denk
2008-04-29 16:48 Andy Fleming
2008-04-29 18:05 ` Wolfgang Denk
2008-04-29 14:44 Andy Fleming
2008-04-29 14:59 ` Wolfgang Denk
2008-04-21 18:04 Andy Fleming
2008-04-24 12:41 ` Kumar Gala
2008-04-24 13:31 ` Wolfgang Denk
2008-04-24 13:30 ` Wolfgang Denk
2008-04-18 22:49 Andy Fleming
2008-04-20 23:33 ` Wolfgang Denk
2008-04-11 22:40 Andy Fleming
2008-04-13 17:17 ` Wolfgang Denk
2008-03-26 17:03 Andy Fleming
2008-03-26 23:17 ` Wolfgang Denk
2008-02-27 23:06 Andy Fleming
2008-03-02 20:50 ` Wolfgang Denk
2008-02-27 23:00 Andy Fleming
2008-03-02 20:47 ` Wolfgang Denk
2008-02-05 17:03 Andy Fleming
2008-02-14 23:18 ` Wolfgang Denk
2008-02-05 0:57 Andy Fleming
2008-02-14 23:13 ` Wolfgang Denk
2008-01-09 17:15 Andy Fleming
2008-01-09 21:47 ` Wolfgang Denk
2008-01-09 23:02 ` gvb.uboot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox