Remove all the remaining nand_spl boards

PATCH New Masahiro Yamada 4 participants 19 messages Jun 4, 2014 – Jun 17, 2014

Subsystems (2)

PowerPC Kbuild

lore

Share & tools

lore

Masahiro Yamada

author

2014-06-04 01:26 UTC #0 lore raw

cover Remove all the remaining nand_spl boards

There are still 7 nand_spl boards.

I built all the other boards and
confirmed this series has no impact on them.

Masahiro Yamada (7):
nand_spl: remove P1023RDS_NAND support
nand_spl: remove MPC8572DS_NAND support
nand_spl: remove MPC8569MDS_NAND support
nand_spl: remove MPC8536DS support
nand_spl: remove MPC8315ERDB_NAND support
nand_spl: remove simpc8313 support
nand_spl: remove nand_spl infrastructure

 Makefile                                        |  28 +-
 arch/powerpc/cpu/ppc4xx/cpu.c                   |   3 -
 board/freescale/p1023rds/p1023rds.c             |   5 -
 board/freescale/p1023rds/tlb.c                  |   2 -
 board/sheldon/simpc8313/Makefile                |   8 -
 board/sheldon/simpc8313/README.simpc8313        |  80 ----
 board/sheldon/simpc8313/sdram.c                 | 177 --------
 board/sheldon/simpc8313/simpc8313.c             | 150 ------
 boards.cfg                                      |   7 -
 common/env_embedded.c                           |   2 +-
 doc/README.scrapyard                            |  21 +-
 include/configs/MPC8315ERDB.h                   |  32 +-
 include/configs/MPC8536DS.h                     |  29 +-
 include/configs/MPC8569MDS.h                    |  29 --
 include/configs/MPC8572DS.h                     |  30 --
 include/configs/P1023RDS.h                      |  46 +-
 include/configs/SIMPC8313.h                     | 580 ------------------------
 nand_spl/board/freescale/mpc8315erdb/Makefile   |  71 ---
 nand_spl/board/freescale/mpc8315erdb/u-boot.lds |  39 --
 nand_spl/board/freescale/mpc8536ds/Makefile     |  91 ----
 nand_spl/board/freescale/mpc8536ds/nand_boot.c  |  67 ---
 nand_spl/board/freescale/mpc8569mds/Makefile    |  91 ----
 nand_spl/board/freescale/mpc8569mds/nand_boot.c |  60 ---
 nand_spl/board/freescale/mpc8572ds/Makefile     |  91 ----
 nand_spl/board/freescale/mpc8572ds/nand_boot.c  |  67 ---
 nand_spl/board/freescale/p1023rds/Makefile      |  87 ----
 nand_spl/board/freescale/p1023rds/nand_boot.c   |  96 ----
 nand_spl/board/sheldon/simpc8313/Makefile       |  81 ----
 nand_spl/board/sheldon/simpc8313/config.mk      |   5 -
 nand_spl/board/sheldon/simpc8313/u-boot.lds     |  38 --
 nand_spl/nand_boot.c                            | 285 ------------
 nand_spl/nand_boot_fsl_elbc.c                   | 142 ------
 32 files changed, 18 insertions(+), 2522 deletions(-)
 delete mode 100644 board/sheldon/simpc8313/Makefile
 delete mode 100644 board/sheldon/simpc8313/README.simpc8313
 delete mode 100644 board/sheldon/simpc8313/sdram.c
 delete mode 100644 board/sheldon/simpc8313/simpc8313.c
 delete mode 100644 include/configs/SIMPC8313.h
 delete mode 100644 nand_spl/board/freescale/mpc8315erdb/Makefile
 delete mode 100644 nand_spl/board/freescale/mpc8315erdb/u-boot.lds
 delete mode 100644 nand_spl/board/freescale/mpc8536ds/Makefile
 delete mode 100644 nand_spl/board/freescale/mpc8536ds/nand_boot.c
 delete mode 100644 nand_spl/board/freescale/mpc8569mds/Makefile
 delete mode 100644 nand_spl/board/freescale/mpc8569mds/nand_boot.c
 delete mode 100644 nand_spl/board/freescale/mpc8572ds/Makefile
 delete mode 100644 nand_spl/board/freescale/mpc8572ds/nand_boot.c
 delete mode 100644 nand_spl/board/freescale/p1023rds/Makefile
 delete mode 100644 nand_spl/board/freescale/p1023rds/nand_boot.c
 delete mode 100644 nand_spl/board/sheldon/simpc8313/Makefile
 delete mode 100644 nand_spl/board/sheldon/simpc8313/config.mk
 delete mode 100644 nand_spl/board/sheldon/simpc8313/u-boot.lds
 delete mode 100644 nand_spl/nand_boot.c
 delete mode 100644 nand_spl/nand_boot_fsl_elbc.c

Signature · 1 line

1.9.1

Masahiro Yamada

author

2014-06-04 01:26 UTC #1 lore raw

PATCH 1/7 nand_spl: remove P1023RDS_NAND support

Commit 3d5a335c announced that all the nand_spl boards would be removed before v2014.07 release.

Signed-off-by Masahiro Yamada <[email protected]>

---

 board/freescale/p1023rds/p1023rds.c           |  5 --
 board/freescale/p1023rds/tlb.c                |  2 -
 boards.cfg                                    |  1 -
 include/configs/P1023RDS.h                    | 46 +------------
 nand_spl/board/freescale/p1023rds/Makefile    | 87 ------------------------
 nand_spl/board/freescale/p1023rds/nand_boot.c | 96 ---------------------------
 6 files changed, 1 insertion(+), 236 deletions(-)
 delete mode 100644 nand_spl/board/freescale/p1023rds/Makefile
 delete mode 100644 nand_spl/board/freescale/p1023rds/nand_boot.c

board/freescale/p1023rds/p1023rds.c +0 -5

index d8c8745..2b883c7 100644
@@ -182,11 +182,6 @@ void ft_board_setup(void *blob, bd_t *bd)
 
 	fdt_fixup_memory(blob, (u64)base, (u64)size);
 
-	/* By default NOR is on, and NAND is disabled */
-#ifdef CONFIG_NAND_U_BOOT
-	do_fixup_by_path_string(blob, "nor_flash", "status", "disabled");
-	do_fixup_by_path_string(blob, "nand_flash", "status", "okay");
-#endif
 #ifdef CONFIG_HAS_FSL_DR_USB
 	fdt_fixup_dr_usb(blob, bd);
 #endif

board/freescale/p1023rds/tlb.c +0 -2

index 8b2bf50..3c92c14 100644
@@ -36,7 +36,6 @@ struct fsl_e_tlb_entry tlb_table[] = {
 		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
 		      0, 1, BOOKE_PAGESZ_4M, 1),
 
-#ifndef CONFIG_NAND_SPL
 	/* *W*G* - BCSR and NOR flash on local bus*/
 	/* This will be changed to *I*G* after relocation to RAM. */
 	SET_TLB_ENTRY(1, CONFIG_SYS_BCSR_BASE, CONFIG_SYS_BCSR_BASE_PHYS,

@@ -79,7 +78,6 @@ struct fsl_e_tlb_entry tlb_table[] = {
 		      CONFIG_SYS_QMAN_MEM_PHYS + 0x00100000,
 		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
 		      0, 10, BOOKE_PAGESZ_1M, 1),
-#endif
 
 	/* *I*G - NAND */
 	SET_TLB_ENTRY(1, CONFIG_SYS_NAND_BASE, CONFIG_SYS_NAND_BASE_PHYS,

boards.cfg +0 -1

index c562c7f..f55cc38 100644
@@ -862,7 +862,6 @@ Active  powerpc     mpc85xx        -           freescale       p1022ds
 Active  powerpc     mpc85xx        -           freescale       p1022ds             P1022DS_SPIFLASH                      P1022DS:SPIFLASH                                                                                                                  Timur Tabi <[email protected]>
 Active  powerpc     mpc85xx        -           freescale       p1023rdb            P1023RDB                              -                                                                                                                                 -
 Active  powerpc     mpc85xx        -           freescale       p1023rds            P1023RDS                              -                                                                                                                                 Roy Zang <[email protected]>
-Active  powerpc     mpc85xx        -           freescale       p1023rds            P1023RDS_NAND                         P1023RDS:NAND                                                                                                                     Roy Zang <[email protected]>
 Active  powerpc     mpc85xx        -           freescale       p1_p2_rdb           P1011RDB                              P1_P2_RDB:P1011RDB                                                                                                                -
 Active  powerpc     mpc85xx        -           freescale       p1_p2_rdb           P1011RDB_36BIT                        P1_P2_RDB:P1011RDB,36BIT                                                                                                          -
 Active  powerpc     mpc85xx        -           freescale       p1_p2_rdb           P1011RDB_36BIT_SDCARD                 P1_P2_RDB:P1011RDB,36BIT,SDCARD                                                                                                   -

include/configs/P1023RDS.h +1 ~~-45~~

96 lines not on this page · raw message

nand_spl/board/freescale/p1023rds/Makefile deleted +0 ~~-87~~

87 lines not on this page · raw message

nand_spl/board/freescale/p1023rds/nand_boot.c deleted +0 ~~-96~~

96 lines not on this page · raw message

Signature · 1 line

1.9.1

Tom Rini

2014-06-05 22:49 UTC #2 lore raw

PATCH 1/7 nand_spl: remove P1023RDS_NAND support

Quoted 4 lines · Masahiro Yamada

Commit 3d5a335c announced that all the nand_spl boards would be removed before v2014.07 release.
Signed-off-by Masahiro Yamada <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140605/5466277e/attachment.pgp>

Scott Wood

2014-06-16 21:46 UTC #3 lore raw

PATCH 1/7 nand_spl: remove P1023RDS_NAND support

In reply to Masahiro Yamada

Quoted 6 lines · Masahiro Yamada

Commit 3d5a335c announced that all the nand_spl boards would be removed before v2014.07 release.
Signed-off-by Masahiro Yamada <[email protected]>
---

Quoted 9 lines

 board/freescale/p1023rds/p1023rds.c           |  5 --
 board/freescale/p1023rds/tlb.c                |  2 -
 boards.cfg                                    |  1 -
 include/configs/P1023RDS.h                    | 46 +------------
 nand_spl/board/freescale/p1023rds/Makefile    | 87 ------------------------
 nand_spl/board/freescale/p1023rds/nand_boot.c | 96 ---------------------------
 6 files changed, 1 insertion(+), 236 deletions(-)
 delete mode 100644 nand_spl/board/freescale/p1023rds/Makefile
 delete mode 100644 nand_spl/board/freescale/p1023rds/nand_boot.c

FWIW, all p1023rds support can probably be removed. Very few boards were ever sold, and support was recently removed from Linux (commit fd7e5b7a8758093781a44df9577fe24e9e11723e).

-Scott

Masahiro Yamada

author

2014-06-17 08:36 UTC #4 lore raw

PATCH 1/7 nand_spl: remove P1023RDS_NAND support

Hello Scott,

Quoted 4 lines · On Mon, 16 Jun 2014 16:46:13 -0500 Scott Wood <[email protected]> wrote:

FWIW, all p1023rds support can probably be removed. Very few boards were ever sold, and support was recently removed from Linux (commit fd7e5b7a8758093781a44df9577fe24e9e11723e).

In that case, could you send a patch to remove it? Or shall I do that ?

Best Regards
Masahiro Yamada

Scott Wood

2014-06-17 15:41 UTC #5 lore raw

PATCH 1/7 nand_spl: remove P1023RDS_NAND support

Quoted 5 lines · Masahiro Yamada

Hello Scott,
On Mon, 16 Jun 2014 16:46:13 -0500
Scott Wood <[email protected]> wrote:

Quoted 7 lines

Quoted 4 lines
FWIW, all p1023rds support can probably be removed. Very few boards were ever sold, and support was recently removed from Linux (commit fd7e5b7a8758093781a44df9577fe24e9e11723e).
In that case, could you send a patch to remove it? Or shall I do that ?

I'm hoping York and/or Roy will comment on the removal first.

-Scott

York Sun

2014-06-17 16:20 UTC #6 lore raw

PATCH 1/7 nand_spl: remove P1023RDS_NAND support

Quoted 11 lines · Scott Wood

Quoted 10 lines · Masahiro Yamada
Hello Scott,
Quoted 4 lines · On Mon, 16 Jun 2014 16:46:13 -0500 Scott Wood <[email protected]> wrote:
FWIW, all p1023rds support can probably be removed. Very few boards were ever sold, and support was recently removed from Linux (commit fd7e5b7a8758093781a44df9577fe24e9e11723e).

Quoted 5 lines

Quoted 2 lines
In that case, could you send a patch to remove it? Or shall I do that ?
I'm hoping York and/or Roy will comment on the removal first.

Looks like we agree to remove P1023RDS board. We have a patch pending for this. I will test it soon.

York

Masahiro Yamada

author

2014-06-04 01:26 UTC #7 lore raw

PATCH 2/7 nand_spl: remove MPC8572DS_NAND support

In reply to Masahiro Yamada

Commit 3d5a335c announced that all the nand_spl boards would be removed before v2014.07 release.

Signed-off-by Masahiro Yamada <[email protected]>

---

 boards.cfg                                     |  1 -
 include/configs/MPC8572DS.h                    | 30 ---------
 nand_spl/board/freescale/mpc8572ds/Makefile    | 91 --------------------------
 nand_spl/board/freescale/mpc8572ds/nand_boot.c | 67 -------------------
 4 files changed, 189 deletions(-)
 delete mode 100644 nand_spl/board/freescale/mpc8572ds/Makefile
 delete mode 100644 nand_spl/board/freescale/mpc8572ds/nand_boot.c

boards.cfg +0 -1

index f55cc38..cf843ca 100644
@@ -823,7 +823,6 @@ Active  powerpc     mpc85xx        -           freescale       mpc8569mds
 Active  powerpc     mpc85xx        -           freescale       mpc8569mds          MPC8569MDS_NAND                       MPC8569MDS:NAND                                                                                                                   -
 Active  powerpc     mpc85xx        -           freescale       mpc8572ds           MPC8572DS                             -                                                                                                                                 York Sun <[email protected]>
 Active  powerpc     mpc85xx        -           freescale       mpc8572ds           MPC8572DS_36BIT                       MPC8572DS:36BIT                                                                                                                   York Sun <[email protected]>
-Active  powerpc     mpc85xx        -           freescale       mpc8572ds           MPC8572DS_NAND                        MPC8572DS:NAND                                                                                                                    -
 Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_36BIT_NAND                P1010RDB:P1010RDB_PA,36BIT,NAND                                                                                                   -
 Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_36BIT_NAND_SECBOOT        P1010RDB:P1010RDB_PA,36BIT,NAND_SECBOOT,SECURE_BOOT                                                                               -
 Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_36BIT_NOR                 P1010RDB:P1010RDB_PA,36BIT                                                                                                        -

include/configs/MPC8572DS.h +0 ~~-30~~

index 48ae9d4..0b07876 100644
@@ -20,18 +20,6 @@
 #define CONFIG_PHYS_64BIT
 #endif
 
-#ifdef CONFIG_NAND
-#define CONFIG_NAND_U_BOOT
-#define CONFIG_RAMBOOT_NAND
-#ifdef CONFIG_NAND_SPL
-#define CONFIG_SYS_TEXT_BASE_SPL 0xfff00000
-#define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE_SPL /* start of monitor */
-#else
-#define CONFIG_SYS_LDSCRIPT $(CPUDIR)/u-boot-nand.lds
-#define CONFIG_SYS_TEXT_BASE	0xf8f82000
-#endif /* CONFIG_NAND_SPL */
-#endif
-
 #ifndef CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_TEXT_BASE	0xeff40000
 #endif

@@ -208,12 +196,7 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT	60000		/* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT	500		/* Flash Write Timeout (ms) */
 
-#if defined(CONFIG_RAMBOOT_NAND)
-#define CONFIG_SYS_RAMBOOT
-#define CONFIG_SYS_EXTRA_ENV_RELOC
-#else
 #undef CONFIG_SYS_RAMBOOT
-#endif
 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI

@@ -353,17 +336,10 @@
 			       | OR_FCM_TRLX \
 			       | OR_FCM_EHTR)
 
-#ifdef CONFIG_RAMBOOT_NAND
-#define CONFIG_SYS_BR0_PRELIM  CONFIG_SYS_NAND_BR_PRELIM /* NAND Base Address */
-#define CONFIG_SYS_OR0_PRELIM  CONFIG_SYS_NAND_OR_PRELIM /* NAND Options */
-#define CONFIG_SYS_BR2_PRELIM  CONFIG_FLASH_BR_PRELIM	/* NOR Base Address */
-#define CONFIG_SYS_OR2_PRELIM  CONFIG_FLASH_OR_PRELIM	/* NOR Options */
-#else
 #define CONFIG_SYS_BR0_PRELIM  CONFIG_FLASH_BR_PRELIM	/* NOR Base Address */
 #define CONFIG_SYS_OR0_PRELIM  CONFIG_FLASH_OR_PRELIM	/* NOR Options */
 #define CONFIG_SYS_BR2_PRELIM  CONFIG_SYS_NAND_BR_PRELIM /* NAND Base Address */
 #define CONFIG_SYS_OR2_PRELIM  CONFIG_SYS_NAND_OR_PRELIM /* NAND Options */
-#endif
 #define CONFIG_SYS_BR4_PRELIM  (BR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS + 0x40000) \
 			       | (2<<BR_DECC_SHIFT)    /* Use HW ECC */ \
 			       | BR_PS_8	       /* Port Size = 8 bit */ \

@@ -600,12 +576,6 @@
  */
 
 #if defined(CONFIG_SYS_RAMBOOT)
-#if defined(CONFIG_RAMBOOT_NAND)
-#define CONFIG_ENV_IS_IN_NAND	1
-#define CONFIG_ENV_SIZE	CONFIG_SYS_NAND_BLOCK_SIZE
-#define CONFIG_ENV_OFFSET	((512 * 1024)\
-				+ CONFIG_SYS_NAND_BLOCK_SIZE)
-#endif
 
 #else
 	#define CONFIG_ENV_IS_IN_FLASH	1

nand_spl/board/freescale/mpc8572ds/Makefile deleted +0 ~~-91~~

91 lines not on this page · raw message

nand_spl/board/freescale/mpc8572ds/nand_boot.c deleted +0 ~~-67~~

67 lines not on this page · raw message

Signature · 1 line

1.9.1

Tom Rini

2014-06-05 22:49 UTC #8 lore raw

PATCH 2/7 nand_spl: remove MPC8572DS_NAND support

Quoted 4 lines · Masahiro Yamada

Commit 3d5a335c announced that all the nand_spl boards would be removed before v2014.07 release.
Signed-off-by Masahiro Yamada <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140605/55d64113/attachment.pgp>

Masahiro Yamada

author

2014-06-04 01:26 UTC #9 lore raw

PATCH 3/7 nand_spl: remove MPC8569MDS_NAND support

In reply to Masahiro Yamada

Commit 3d5a335c announced that all the nand_spl boards would be removed before v2014.07 release.

Signed-off-by Masahiro Yamada <[email protected]>

---

 boards.cfg                                      |  1 -
 include/configs/MPC8569MDS.h                    | 29 --------
 nand_spl/board/freescale/mpc8569mds/Makefile    | 91 -------------------------
 nand_spl/board/freescale/mpc8569mds/nand_boot.c | 60 ----------------
 4 files changed, 181 deletions(-)
 delete mode 100644 nand_spl/board/freescale/mpc8569mds/Makefile
 delete mode 100644 nand_spl/board/freescale/mpc8569mds/nand_boot.c

boards.cfg +0 -1

index cf843ca..df1ccf0 100644
@@ -820,7 +820,6 @@ Active  powerpc     mpc85xx        -           freescale       mpc8560ads
 Active  powerpc     mpc85xx        -           freescale       mpc8568mds          MPC8568MDS                            -                                                                                                                                 -
 Active  powerpc     mpc85xx        -           freescale       mpc8569mds          MPC8569MDS                            -                                                                                                                                 -
 Active  powerpc     mpc85xx        -           freescale       mpc8569mds          MPC8569MDS_ATM                        MPC8569MDS:ATM                                                                                                                    -
-Active  powerpc     mpc85xx        -           freescale       mpc8569mds          MPC8569MDS_NAND                       MPC8569MDS:NAND                                                                                                                   -
 Active  powerpc     mpc85xx        -           freescale       mpc8572ds           MPC8572DS                             -                                                                                                                                 York Sun <[email protected]>
 Active  powerpc     mpc85xx        -           freescale       mpc8572ds           MPC8572DS_36BIT                       MPC8572DS:36BIT                                                                                                                   York Sun <[email protected]>
 Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_36BIT_NAND                P1010RDB:P1010RDB_PA,36BIT,NAND                                                                                                   -

include/configs/MPC8569MDS.h +0 ~~-29~~

index 5165a45..4da247c 100644
@@ -49,18 +49,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_L2_CACHE				/* toggle L2 cache	*/
 #define CONFIG_BTB				/* toggle branch predition */
 
-#ifdef CONFIG_NAND
-#define CONFIG_NAND_U_BOOT		1
-#define CONFIG_RAMBOOT_NAND		1
-#ifdef CONFIG_NAND_SPL
-#define CONFIG_SYS_TEXT_BASE_SPL 0xfff00000
-#define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE_SPL /* start of monitor */
-#else
-#define CONFIG_SYS_LDSCRIPT $(CPUDIR)/u-boot-nand.lds
-#define CONFIG_SYS_TEXT_BASE	0xf8f82000
-#endif
-#endif
-
 #ifndef CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_TEXT_BASE	0xfff80000
 #endif

@@ -180,12 +168,7 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_SYS_FLASH_ERASE_TOUT	60000	/* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT	500	/* Flash Write Timeout (ms) */
 
-#if defined(CONFIG_RAMBOOT_NAND)
-#define CONFIG_SYS_RAMBOOT
-#define CONFIG_SYS_EXTRA_ENV_RELOC
-#else
 #undef CONFIG_SYS_RAMBOOT
-#endif
 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI

@@ -228,17 +211,10 @@ extern unsigned long get_clock_freq(void);
 				| OR_FCM_TRLX \
 				| OR_FCM_EHTR)
 
-#ifdef CONFIG_RAMBOOT_NAND
-#define CONFIG_SYS_BR0_PRELIM	CONFIG_SYS_NAND_BR_PRELIM /* NAND Base Address */
-#define CONFIG_SYS_OR0_PRELIM	CONFIG_SYS_NAND_OR_PRELIM/* NAND Options */
-#define CONFIG_SYS_BR3_PRELIM	CONFIG_FLASH_BR_PRELIM	/* NOR Base Address */
-#define CONFIG_SYS_OR3_PRELIM	CONFIG_FLASH_OR_PRELIM	/* NOR Options */
-#else
 #define CONFIG_SYS_BR0_PRELIM	CONFIG_FLASH_BR_PRELIM	/* NOR Base Address */
 #define CONFIG_SYS_OR0_PRELIM	CONFIG_FLASH_OR_PRELIM	/* NOR Options */
 #define CONFIG_SYS_BR3_PRELIM	CONFIG_SYS_NAND_BR_PRELIM /* NAND Base Address */
 #define CONFIG_SYS_OR3_PRELIM	CONFIG_SYS_NAND_OR_PRELIM /* NAND Options */
-#endif
 
 #define CONFIG_SYS_LBC_LCRR	0x00000004	/* LB clock ratio reg */
 #define CONFIG_SYS_LBC_LBCR	0x00040000	/* LB config reg */

@@ -476,11 +452,6 @@ extern unsigned long get_clock_freq(void);
  * Environment
  */
 #if defined(CONFIG_SYS_RAMBOOT)
-#if defined(CONFIG_RAMBOOT_NAND)
-#define CONFIG_ENV_IS_IN_NAND	1
-#define CONFIG_ENV_SIZE		CONFIG_SYS_NAND_BLOCK_SIZE
-#define CONFIG_ENV_OFFSET	((512 * 1024) + CONFIG_SYS_NAND_BLOCK_SIZE)
-#endif
 #else
 #define CONFIG_ENV_IS_IN_FLASH	1
 #define CONFIG_ENV_ADDR		(CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)

nand_spl/board/freescale/mpc8569mds/Makefile deleted +0 ~~-91~~

91 lines not on this page · raw message

nand_spl/board/freescale/mpc8569mds/nand_boot.c deleted +0 ~~-60~~

60 lines not on this page · raw message

Signature · 1 line

1.9.1

Tom Rini

2014-06-05 22:49 UTC #10 lore raw

PATCH 3/7 nand_spl: remove MPC8569MDS_NAND support

Quoted 4 lines · Masahiro Yamada

Commit 3d5a335c announced that all the nand_spl boards would be removed before v2014.07 release.
Signed-off-by Masahiro Yamada <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140605/3d5f0f75/attachment.pgp>

Masahiro Yamada

author

2014-06-04 01:26 UTC #11 lore raw

PATCH 4/7 nand_spl: remove MPC8536DS support

In reply to Masahiro Yamada

Commit 3d5a335c announced that all the nand_spl boards would be removed before v2014.07 release.

Signed-off-by Masahiro Yamada <[email protected]>

---

 boards.cfg                                     |  1 -
 include/configs/MPC8536DS.h                    | 29 +-------
 nand_spl/board/freescale/mpc8536ds/Makefile    | 91 --------------------------
 nand_spl/board/freescale/mpc8536ds/nand_boot.c | 67 -------------------
 4 files changed, 2 insertions(+), 186 deletions(-)
 delete mode 100644 nand_spl/board/freescale/mpc8536ds/Makefile
 delete mode 100644 nand_spl/board/freescale/mpc8536ds/nand_boot.c

boards.cfg +0 -1

index df1ccf0..50e6d76 100644
@@ -804,7 +804,6 @@ Active  powerpc     mpc85xx        -           freescale       corenet_ds
 Active  powerpc     mpc85xx        -           freescale       corenet_ds          P5040DS_SPIFLASH                      P5040DS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000                                                                             -
 Active  powerpc     mpc85xx        -           freescale       mpc8536ds           MPC8536DS                             -                                                                                                                                 -
 Active  powerpc     mpc85xx        -           freescale       mpc8536ds           MPC8536DS_36BIT                       MPC8536DS:36BIT                                                                                                                   -
-Active  powerpc     mpc85xx        -           freescale       mpc8536ds           MPC8536DS_NAND                        MPC8536DS:NAND                                                                                                                    -
 Active  powerpc     mpc85xx        -           freescale       mpc8536ds           MPC8536DS_SDCARD                      MPC8536DS:SDCARD                                                                                                                  -
 Active  powerpc     mpc85xx        -           freescale       mpc8536ds           MPC8536DS_SPIFLASH                    MPC8536DS:SPIFLASH                                                                                                                -
 Active  powerpc     mpc85xx        -           freescale       mpc8540ads          MPC8540ADS                            -                                                                                                                                 Kumar Gala <[email protected]>

include/configs/MPC8536DS.h +2 ~~-27~~

index 72f5fde..2722164 100644
@@ -19,18 +19,6 @@
 #define CONFIG_PHYS_64BIT	1
 #endif
 
-#ifdef CONFIG_NAND
-#define CONFIG_NAND_U_BOOT		1
-#define CONFIG_RAMBOOT_NAND		1
-#ifdef CONFIG_NAND_SPL
-#define CONFIG_SYS_TEXT_BASE_SPL 0xfff00000
-#define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE_SPL /* start of monitor */
-#else
-#define CONFIG_SYS_LDSCRIPT $(CPUDIR)/u-boot-nand.lds
-#define CONFIG_SYS_TEXT_BASE	0xf8f82000
-#endif /* CONFIG_NAND_SPL */
-#endif
-
 #ifdef CONFIG_SDCARD
 #define CONFIG_RAMBOOT_SDCARD		1
 #define CONFIG_SYS_TEXT_BASE	0xf8f40000

@@ -222,8 +210,7 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT	60000	/* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT	500	/* Flash Write Timeout (ms) */
 
-#if defined(CONFIG_RAMBOOT_NAND) || defined(CONFIG_RAMBOOT_SDCARD) || \
-    defined(CONFIG_RAMBOOT_SPIFLASH)
+#if defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH)
 #define CONFIG_SYS_RAMBOOT
 #define CONFIG_SYS_EXTRA_ENV_RELOC
 #else

@@ -352,17 +339,10 @@
 		| OR_FCM_TRLX \
 		| OR_FCM_EHTR)
 
-#ifdef CONFIG_RAMBOOT_NAND
-#define CONFIG_SYS_BR0_PRELIM  CONFIG_SYS_NAND_BR_PRELIM /* NAND Base Address */
-#define CONFIG_SYS_OR0_PRELIM  CONFIG_SYS_NAND_OR_PRELIM /* NAND Options */
-#define CONFIG_SYS_BR2_PRELIM  CONFIG_FLASH_BR_PRELIM	/* NOR Base Address */
-#define CONFIG_SYS_OR2_PRELIM  CONFIG_FLASH_OR_PRELIM	/* NOR Options */
-#else
 #define CONFIG_SYS_BR0_PRELIM  CONFIG_FLASH_BR_PRELIM	/* NOR Base Address */
 #define CONFIG_SYS_OR0_PRELIM  CONFIG_FLASH_OR_PRELIM	/* NOR Options */
 #define CONFIG_SYS_BR2_PRELIM  CONFIG_SYS_NAND_BR_PRELIM /* NAND Base Address */
 #define CONFIG_SYS_OR2_PRELIM  CONFIG_SYS_NAND_OR_PRELIM /* NAND Options */
-#endif
 
 #define CONFIG_SYS_BR4_PRELIM \
 		(BR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS + 0x40000) \

@@ -625,12 +605,7 @@
  */
 
 #if defined(CONFIG_SYS_RAMBOOT)
-#if defined(CONFIG_RAMBOOT_NAND)
-#define CONFIG_ENV_IS_IN_NAND	1
-#define CONFIG_ENV_SIZE		CONFIG_SYS_NAND_BLOCK_SIZE
-#define CONFIG_ENV_OFFSET ((768 * 1024) + CONFIG_SYS_NAND_BLOCK_SIZE)
-#define CONFIG_ENV_RANGE	(3 * CONFIG_ENV_SIZE)
-#elif defined(CONFIG_RAMBOOT_SPIFLASH)
+#if defined(CONFIG_RAMBOOT_SPIFLASH)
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS	0
 #define CONFIG_ENV_SPI_CS	0

nand_spl/board/freescale/mpc8536ds/Makefile deleted +0 ~~-91~~

91 lines not on this page · raw message

nand_spl/board/freescale/mpc8536ds/nand_boot.c deleted +0 ~~-67~~

67 lines not on this page · raw message

Signature · 1 line

1.9.1

Tom Rini

2014-06-05 22:49 UTC #12 lore raw

PATCH 4/7 nand_spl: remove MPC8536DS support

Quoted 4 lines · Masahiro Yamada

Commit 3d5a335c announced that all the nand_spl boards would be removed before v2014.07 release.
Signed-off-by Masahiro Yamada <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140605/ab4815d4/attachment.pgp>

Masahiro Yamada

author

2014-06-04 01:26 UTC #13 lore raw

PATCH 5/7 nand_spl: remove MPC8315ERDB_NAND support

In reply to Masahiro Yamada

Commit 3d5a335c announced that all the nand_spl boards would be removed before v2014.07 release.

Signed-off-by Masahiro Yamada <[email protected]>

---

 boards.cfg                                      |  1 -
 include/configs/MPC8315ERDB.h                   | 32 +----------
 nand_spl/board/freescale/mpc8315erdb/Makefile   | 71 -------------------------
 nand_spl/board/freescale/mpc8315erdb/u-boot.lds | 39 --------------
 4 files changed, 2 insertions(+), 141 deletions(-)
 delete mode 100644 nand_spl/board/freescale/mpc8315erdb/Makefile
 delete mode 100644 nand_spl/board/freescale/mpc8315erdb/u-boot.lds

boards.cfg +0 -1

index 50e6d76..37f5f5e 100644
@@ -707,7 +707,6 @@ Active  powerpc     mpc83xx        -           freescale       mpc8313erdb
 Active  powerpc     mpc83xx        -           freescale       mpc8313erdb         MPC8313ERDB_NAND_33                   MPC8313ERDB:SYS_33MHZ,NAND                                                                                                        -
 Active  powerpc     mpc83xx        -           freescale       mpc8313erdb         MPC8313ERDB_NAND_66                   MPC8313ERDB:SYS_66MHZ,NAND                                                                                                        -
 Active  powerpc     mpc83xx        -           freescale       mpc8315erdb         MPC8315ERDB                           -                                                                                                                                 Dave Liu <[email protected]>
-Active  powerpc     mpc83xx        -           freescale       mpc8315erdb         MPC8315ERDB_NAND                      MPC8315ERDB:NAND_U_BOOT                                                                                                           Dave Liu <[email protected]>
 Active  powerpc     mpc83xx        -           freescale       mpc8323erdb         MPC8323ERDB                           -                                                                                                                                 Michael Barkowski <[email protected]>
 Active  powerpc     mpc83xx        -           freescale       mpc832xemds         MPC832XEMDS                           -                                                                                                                                 Dave Liu <[email protected]>
 Active  powerpc     mpc83xx        -           freescale       mpc832xemds         MPC832XEMDS_ATM                       MPC832XEMDS:PQ_MDS_PIB=1,PQ_MDS_PIB_ATM=1                                                                                         Dave Liu <[email protected]>

include/configs/MPC8315ERDB.h +2 ~~-30~~

index 3dd52ce..98e9072 100644
@@ -15,14 +15,6 @@
 #define CONFIG_SYS_NAND_U_BOOT_OFFS  16384
 #define CONFIG_SYS_NAND_U_BOOT_RELOC 0x00010000
 
-#ifdef CONFIG_NAND_U_BOOT
-#define CONFIG_SYS_TEXT_BASE	0x00100000 /* CONFIG_SYS_NAND_U_BOOT_DST */
-#define CONFIG_SYS_TEXT_BASE_SPL 0xfff00000
-#ifdef CONFIG_NAND_SPL
-#define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE_SPL /* start of monitor */
-#endif /* CONFIG_NAND_SPL */
-#endif /* CONFIG_NAND_U_BOOT */
-
 #ifndef CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_TEXT_BASE	0xFE000000
 #endif

@@ -93,10 +85,6 @@
  */
 #define CONFIG_SYS_IMMR		0xE0000000
 
-#if defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
-#define CONFIG_DEFAULT_IMMR	CONFIG_SYS_IMMR
-#endif
-
 /*
  * Arbiter Setup
  */

@@ -281,17 +269,10 @@
 				| OR_FCM_EHTR)
 				/* 0xFFFF8396 */
 
-#ifdef CONFIG_NAND_U_BOOT
-#define CONFIG_SYS_BR0_PRELIM CONFIG_SYS_NAND_BR_PRELIM
-#define CONFIG_SYS_OR0_PRELIM CONFIG_SYS_NAND_OR_PRELIM
-#define CONFIG_SYS_BR1_PRELIM CONFIG_SYS_NOR_BR_PRELIM
-#define CONFIG_SYS_OR1_PRELIM CONFIG_SYS_NOR_OR_PRELIM
-#else
 #define CONFIG_SYS_BR0_PRELIM CONFIG_SYS_NOR_BR_PRELIM
 #define CONFIG_SYS_OR0_PRELIM CONFIG_SYS_NOR_OR_PRELIM
 #define CONFIG_SYS_BR1_PRELIM CONFIG_SYS_NAND_BR_PRELIM
 #define CONFIG_SYS_OR1_PRELIM CONFIG_SYS_NAND_OR_PRELIM
-#endif
 
 #define CONFIG_SYS_LBLAWBAR1_PRELIM	CONFIG_SYS_NAND_BASE
 #define CONFIG_SYS_LBLAWAR1_PRELIM	(LBLAWAR_EN | LBLAWAR_32KB)

@@ -459,16 +440,7 @@
 /*
  * Environment
  */
-#if defined(CONFIG_NAND_U_BOOT)
-	#define CONFIG_ENV_IS_IN_NAND	1
-	#define CONFIG_ENV_OFFSET		(512 * 1024)
-	#define CONFIG_ENV_SECT_SIZE	CONFIG_SYS_NAND_BLOCK_SIZE
-	#define CONFIG_ENV_SIZE		CONFIG_ENV_SECT_SIZE
-	#define CONFIG_ENV_SIZE_REDUND	CONFIG_ENV_SIZE
-	#define CONFIG_ENV_RANGE	(CONFIG_ENV_SECT_SIZE * 4)
-	#define CONFIG_ENV_OFFSET_REDUND	(CONFIG_ENV_OFFSET + \
-						 CONFIG_ENV_RANGE)
-#elif !defined(CONFIG_SYS_RAMBOOT)
+#if !defined(CONFIG_SYS_RAMBOOT)
 	#define CONFIG_ENV_IS_IN_FLASH	1
 	#define CONFIG_ENV_ADDR		\
 			(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)

@@ -503,7 +475,7 @@
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_PCI
 
-#if defined(CONFIG_SYS_RAMBOOT) && !defined(CONFIG_NAND_U_BOOT)
+#if defined(CONFIG_SYS_RAMBOOT)
     #undef CONFIG_CMD_SAVEENV
     #undef CONFIG_CMD_LOADS
 #endif

nand_spl/board/freescale/mpc8315erdb/Makefile deleted +0 ~~-71~~

71 lines not on this page · raw message

nand_spl/board/freescale/mpc8315erdb/u-boot.lds deleted +0 ~~-39~~

deleted file mode 100644
index 774772b..0000000
@@ -1,39 +0,0 @@
-/*
- * (C) Copyright 2006
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * Copyright 2008 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-OUTPUT_ARCH(powerpc)
-SECTIONS
-{
-	. = 0xfff00000;
-	.text : {
-		*(.text*)
-		. = ALIGN(16);
-		*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
-	}
-
-	. = ALIGN(8);
-	.data : {
-		*(.data*)
-		*(.sdata*)
-		_GOT2_TABLE_ = .;
-		KEEP(*(.got2))
-		KEEP(*(.got))
-		PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
-	}
-	__got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1;
-
-	. = ALIGN(8);
-	__bss_start = .;
-	.bss (NOLOAD) : {
-		*(.*bss)
-	}
-	__bss_end = .;
-}
-ENTRY(_start)
-ASSERT(__bss_end <= 0xfff01000, "NAND bootstrap too big");

Signature · 1 line

1.9.1

Tom Rini

2014-06-05 22:49 UTC #14 lore raw

PATCH 5/7 nand_spl: remove MPC8315ERDB_NAND support

Quoted 4 lines · Masahiro Yamada

Commit 3d5a335c announced that all the nand_spl boards would be removed before v2014.07 release.
Signed-off-by Masahiro Yamada <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140605/2cb95118/attachment.pgp>

Masahiro Yamada

author

2014-06-04 01:26 UTC #15 lore raw

PATCH 6/7 nand_spl: remove simpc8313 support

In reply to Masahiro Yamada

Commit 3d5a335c announced that all the nand_spl boards would be removed before v2014.07 release.

Also update README.scrapyard.

Signed-off-by Masahiro Yamada <[email protected]>

---

 board/sheldon/simpc8313/Makefile            |   8 -
 board/sheldon/simpc8313/README.simpc8313    |  80 ----
 board/sheldon/simpc8313/sdram.c             | 177 ---------
 board/sheldon/simpc8313/simpc8313.c         | 150 -------
 boards.cfg                                  |   2 -
 doc/README.scrapyard                        |  21 +-
 include/configs/SIMPC8313.h                 | 580 ----------------------------
 nand_spl/board/sheldon/simpc8313/Makefile   |  81 ----
 nand_spl/board/sheldon/simpc8313/config.mk  |   5 -
 nand_spl/board/sheldon/simpc8313/u-boot.lds |  38 --
 10 files changed, 11 insertions(+), 1131 deletions(-)
 delete mode 100644 board/sheldon/simpc8313/Makefile
 delete mode 100644 board/sheldon/simpc8313/README.simpc8313
 delete mode 100644 board/sheldon/simpc8313/sdram.c
 delete mode 100644 board/sheldon/simpc8313/simpc8313.c
 delete mode 100644 include/configs/SIMPC8313.h
 delete mode 100644 nand_spl/board/sheldon/simpc8313/Makefile
 delete mode 100644 nand_spl/board/sheldon/simpc8313/config.mk
 delete mode 100644 nand_spl/board/sheldon/simpc8313/u-boot.lds

board/sheldon/simpc8313/Makefile deleted +0 -8

deleted file mode 100644
index a824c41..0000000
@@ -1,8 +0,0 @@
-#
-# (C) Copyright 2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-obj-y	:= simpc8313.o sdram.o

board/sheldon/simpc8313/README.simpc8313 deleted +0 ~~-80~~

80 lines not on this page · raw message

board/sheldon/simpc8313/sdram.c deleted +0 ~~-177~~

177 lines not on this page · raw message

board/sheldon/simpc8313/simpc8313.c deleted +0 ~~-150~~

150 lines not on this page · raw message

boards.cfg +0 -2

index 37f5f5e..bda1472 100644
@@ -739,8 +739,6 @@ Active  powerpc     mpc83xx        -           keymile         km83xx
 Active  powerpc     mpc83xx        -           keymile         km83xx              suvd3                                 suvd3:SUVD3                                                                                                                       Holger Brunck <[email protected]>
 Active  powerpc     mpc83xx        -           keymile         km83xx              tuge1                                 tuxx1:TUGE1                                                                                                                       Holger Brunck <[email protected]>
 Active  powerpc     mpc83xx        -           keymile         km83xx              tuxx1                                 tuxx1:TUXX1                                                                                                                       Holger Brunck <[email protected]>
-Active  powerpc     mpc83xx        -           sheldon         simpc8313           SIMPC8313_LP                          SIMPC8313:NAND_LP                                                                                                                 Ron Madrid <[email protected]>
-Active  powerpc     mpc83xx        -           sheldon         simpc8313           SIMPC8313_SP                          SIMPC8313:NAND_SP                                                                                                                 Ron Madrid <[email protected]>
 Active  powerpc     mpc83xx        -           tqc             tqm834x             TQM834x                               -                                                                                                                                 -
 Active  powerpc     mpc85xx        -           -               sbc8548             sbc8548                               -                                                                                                                                 Paul Gortmaker <[email protected]>
 Active  powerpc     mpc85xx        -           -               sbc8548             sbc8548_PCI_33                        sbc8548:PCI,33                                                                                                                    Paul Gortmaker <[email protected]>

doc/README.scrapyard +11 ~~-10~~

index e2157e0..6c6be68 100644
@@ -11,16 +11,17 @@ easily if here is something they might want to dig for...
 
 Board            Arch        CPU            Commit      Removed     Last known maintainer/contact
 =================================================================================================
-hidden_dragon    powerpc     mpc824x        -           -           Yusdi Santoso <[email protected]>
-debris           powerpc     mpc824x        -           -           Sangmoon Kim <[email protected]>
-kvme080          powerpc     mpc824x        -           -           Sangmoon Kim <[email protected]>
-ep8248           powerpc     mpc8260        -           -           Yuli Barcohen <[email protected]>
-ispan            powerpc     mpc8260        -           -           Yuli Barcohen <[email protected]>
-rattler          powerpc     mpc8260        -           -           Yuli Barcohen <[email protected]>
-zpc1900          powerpc     mpc8260        -           -           Yuli Barcohen <[email protected]>
-mpc8260ads       powerpc     mpc8260        -           -           Yuli Barcohen <[email protected]>
-adder            powerpc     mpc8xx         -           -           Yuli Barcohen <[email protected]>
-quad100hd	 powerpc     ppc405ep	    -		-	    Gary Jennejohn <[email protected]>
+simpc8313        powerpc     mpc83xx        -           2014-04-28  Ron Madrid <[email protected]>
+hidden_dragon    powerpc     mpc824x        3fe1a854    2014-05-30  Yusdi Santoso <[email protected]>
+debris           powerpc     mpc824x        7edb1f7b    2014-05-30  Sangmoon Kim <[email protected]>
+kvme080          powerpc     mpc824x        2868f862    2014-05-30  Sangmoon Kim <[email protected]>
+ep8248           powerpc     mpc8260        49ad566d    2014-05-30  Yuli Barcohen <[email protected]>
+ispan            powerpc     mpc8260        80bae39a    2014-05-30  Yuli Barcohen <[email protected]>
+rattler          powerpc     mpc8260        d0664db4    2014-05-30  Yuli Barcohen <[email protected]>
+zpc1900          powerpc     mpc8260        6f80bb48    2014-05-30  Yuli Barcohen <[email protected]>
+mpc8260ads       powerpc     mpc8260        facb6725    2014-05-30  Yuli Barcohen <[email protected]>
+adder            powerpc     mpc8xx         373a9788    2014-05-30  Yuli Barcohen <[email protected]>
+quad100hd        powerpc     ppc405ep       3569571d    2014-05-30  Gary Jennejohn <[email protected]>
 lubbock          arm         pxa            36bf57b     2014-04-18  Kyle Harris <[email protected]>
 EVB64260	 powerpc     mpc824x        bb3aef9	2014-04-18
 MOUSSE           powerpc     mpc824x        03f2ecc     2014-04-18

include/configs/SIMPC8313.h deleted +0 ~~-580~~

580 lines not on this page · raw message

nand_spl/board/sheldon/simpc8313/Makefile deleted +0 ~~-81~~

81 lines not on this page · raw message

nand_spl/board/sheldon/simpc8313/config.mk deleted +0 -5

deleted file mode 100644
index d1b4e2e..0000000
@@ -1,5 +0,0 @@
-ifdef CONFIG_NAND_LP
-PAD_TO = 0xFFF20000
-else
-PAD_TO = 0xFFF04000
-endif

nand_spl/board/sheldon/simpc8313/u-boot.lds deleted +0 ~~-38~~

deleted file mode 100644
index 4e4d511..0000000
@@ -1,38 +0,0 @@
-/*
- * (C) Copyright 2006
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * Copyright 2008 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-OUTPUT_ARCH(powerpc)
-SECTIONS
-{
-	. = 0xfff00000;
-	.text : {
-		*(.text*)
-		. = ALIGN(16);
-		*(.eh_frame)
-		*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
-	}
-
-	. = ALIGN(8);
-	.data : {
-		*(.data*)
-		*(.sdata*)
-		_GOT2_TABLE_ = .;
-		*(.got2)
-		KEEP(*(.got))
-		PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
-	}
-	__got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1;
-
-	. = ALIGN(8);
-	__bss_start = .;
-	.bss (NOLOAD) : { *(.*bss) }
-	__bss_end = .;
-}
-ENTRY(_start)
-ASSERT(__bss_end <= 0xfff01000, "NAND bootstrap too big");

Signature · 1 line

1.9.1

Tom Rini

2014-06-05 22:49 UTC #16 lore raw

PATCH 6/7 nand_spl: remove simpc8313 support

Quoted 6 lines · Masahiro Yamada

Commit 3d5a335c announced that all the nand_spl boards would be removed before v2014.07 release.
Also update README.scrapyard.
Signed-off-by Masahiro Yamada <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140605/9139ea1b/attachment.pgp>

Masahiro Yamada

author

2014-06-04 01:26 UTC #17 lore raw

PATCH 7/7 nand_spl: remove nand_spl infrastructure

In reply to Masahiro Yamada

Remove the common infrastructure of nand_spl and clean-up the code inside ifdef(CONFIG_NAND_U_BOOT)..endif.

Signed-off-by Masahiro Yamada <[email protected]>

---

 Makefile                      |  28 +----
 arch/powerpc/cpu/ppc4xx/cpu.c |   3 -
 common/env_embedded.c         |   2 +-
 nand_spl/nand_boot.c          | 285 ------------------------------------------
 nand_spl/nand_boot_fsl_elbc.c | 142 ---------------------
 5 files changed, 2 insertions(+), 458 deletions(-)
 delete mode 100644 nand_spl/nand_boot.c
 delete mode 100644 nand_spl/nand_boot_fsl_elbc.c

Makefile +1 ~~-27~~

index f80cf40..d5a8660 100644
@@ -515,12 +515,6 @@ endif
 
 # If there is no specified link script, we look in a number of places for it
 ifndef LDSCRIPT
-	ifeq ($(CONFIG_NAND_U_BOOT),y)
-		LDSCRIPT := $(srctree)/board/$(BOARDDIR)/u-boot-nand.lds
-		ifeq ($(wildcard $(LDSCRIPT)),)
-			LDSCRIPT := $(srctree)/$(CPUDIR)/u-boot-nand.lds
-		endif
-	endif
 	ifeq ($(wildcard $(LDSCRIPT)),)
 		LDSCRIPT := $(srctree)/board/$(BOARDDIR)/u-boot.lds
 	endif

@@ -742,7 +736,6 @@ endif
 # Always append ALL so that arch config.mk's can add custom ones
 ALL-y += u-boot.srec u-boot.bin System.map
 
-ALL-$(CONFIG_NAND_U_BOOT) += u-boot-nand.bin
 ALL-$(CONFIG_ONENAND_U_BOOT) += u-boot-onenand.bin
 ifeq ($(CONFIG_SPL_FSL_PBL),y)
 ALL-$(CONFIG_RAMBOOT_PBL) += u-boot-with-spl-pbl.bin

@@ -1148,23 +1141,6 @@ cmd_cpp_lds = $(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) -ansi \
 u-boot.lds: $(LDSCRIPT) prepare FORCE
 	$(call if_changed_dep,cpp_lds)
 
-PHONY += nand_spl
-nand_spl: prepare
-	$(Q)$(MAKE) $(build)=nand_spl/board/$(BOARDDIR) all
-	@echo >&2
-	@echo >&2 "==================== WARNING ====================="
-	@echo >&2 "nand_spl will not be included in v2014.07 release."
-	@echo >&2 "Please switch over to SPL."
-	@echo >&2 "Otherwise, this board will be removed."
-	@echo >&2 "=================================================="
-	@echo >&2
-
-nand_spl/u-boot-spl-16k.bin: nand_spl
-	@:
-
-u-boot-nand.bin: nand_spl/u-boot-spl-16k.bin u-boot.bin FORCE
-	$(call if_changed,cat)
-
 spl/u-boot-spl.bin: spl/u-boot-spl
 	@:
 spl/u-boot-spl: tools prepare

@@ -1257,7 +1233,7 @@ CLEAN_FILES += u-boot.lds include/bmp_logo.h include/bmp_logo_data.h \
 CLOBBER_DIRS  += $(patsubst %,spl/%, $(filter-out Makefile, \
 		 $(shell ls -1 spl 2>/dev/null))) \
 		 tpl
-CLOBBER_FILES += u-boot* MLO* SPL System.map nand_spl/u-boot*
+CLOBBER_FILES += u-boot* MLO* SPL System.map
 
 # Directories & files removed with 'make mrproper'
 MRPROPER_DIRS  += include/config include/generated          \

@@ -1290,8 +1266,6 @@ clean: $(clean-dirs)
 		-o -name '*.symtypes' -o -name 'modules.order' \
 		-o -name modules.builtin -o -name '.tmp_*.o.*' \
 		-o -name '*.gcno' \) -type f -print | xargs rm -f
-	@find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
-		-path './nand_spl/*' -type l -print | xargs rm -f
 
 # clobber
 #

arch/powerpc/cpu/ppc4xx/cpu.c +0 -3

index d1fc7f3..6a48526 100644
@@ -607,9 +607,6 @@ int checkcpu (void)
 #if defined(SDR0_PINSTP_SHIFT)
 	printf ("       Bootstrap Option %c - ", bootstrap_char[bootstrap_option()]);
 	printf ("Boot ROM Location %s", bootstrap_str[bootstrap_option()]);
-#ifdef CONFIG_NAND_U_BOOT
-	puts(", booting from NAND");
-#endif /* CONFIG_NAND_U_BOOT */
 	putc('\n');
 #endif	/* SDR0_PINSTP_SHIFT */

common/env_embedded.c +1 -1

index 1c4f915..56a13cb 100644
@@ -33,7 +33,7 @@
  * a seperate section.  Note that ENV_CRC is only defined when building
  * U-Boot itself.
  */
-#if (defined(CONFIG_SYS_USE_PPCENV) || defined(CONFIG_NAND_U_BOOT)) && \
+#if defined(CONFIG_SYS_USE_PPCENV) && \
 	defined(ENV_CRC) /* Environment embedded in U-Boot .ppcenv section */
 /* XXX - This only works with GNU C */
 #  define __PPCENV__	__attribute__ ((section(".ppcenv")))

nand_spl/nand_boot.c deleted +0 ~~-285~~

285 lines not on this page · raw message

nand_spl/nand_boot_fsl_elbc.c deleted +0 ~~-142~~

142 lines not on this page · raw message

Signature · 1 line

1.9.1

Tom Rini

2014-06-05 22:49 UTC #18 lore raw

PATCH 7/7 nand_spl: remove nand_spl infrastructure

Quoted 4 lines · Masahiro Yamada

Remove the common infrastructure of nand_spl and clean-up the code inside ifdef(CONFIG_NAND_U_BOOT)..endif.
Signed-off-by Masahiro Yamada <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140605/2cda2a63/attachment.pgp>