[U-Boot] [PATCH 1/5] 83xx: Remove warmboot parameter from PCI init functions
This change lays the groundwork for the BOOTFLAG_* flags being removed.
This change has the small affect of delaying 100ms on PCI initialization after a warm boot as opposed to the optimal 1ms on some boards.
Signed-off-by: Peter Tyser ptyser@xes-inc.com CC: kim.phillips@freescale.com --- arch/powerpc/cpu/mpc83xx/pci.c | 6 +++--- arch/powerpc/cpu/mpc83xx/pcie.c | 6 +++--- board/esd/vme8349/pci.c | 2 +- board/freescale/mpc8308rdb/mpc8308rdb.c | 2 +- board/freescale/mpc8313erdb/mpc8313erdb.c | 8 +------- board/freescale/mpc8315erdb/mpc8315erdb.c | 8 ++------ board/freescale/mpc8323erdb/mpc8323erdb.c | 2 +- board/freescale/mpc832xemds/pci.c | 6 +++--- board/freescale/mpc8349emds/pci.c | 6 +++--- board/freescale/mpc8349itx/pci.c | 4 ++-- board/freescale/mpc8360emds/pci.c | 6 +++--- board/freescale/mpc8360erdk/mpc8360erdk.c | 2 +- board/freescale/mpc837xemds/pci.c | 2 +- board/freescale/mpc837xerdb/pci.c | 4 ++-- board/matrix_vision/mvblm7/pci.c | 5 +---- board/sbc8349/pci.c | 2 +- board/sheldon/simpc8313/simpc8313.c | 5 +---- board/tqc/tqm834x/pci.c | 2 +- board/ve8313/ve8313.c | 5 +---- include/mpc83xx.h | 4 ++-- 20 files changed, 34 insertions(+), 53 deletions(-)
diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c index a42b230..288d99f 100644 --- a/arch/powerpc/cpu/mpc83xx/pci.c +++ b/arch/powerpc/cpu/mpc83xx/pci.c @@ -133,7 +133,7 @@ static void pci_init_bus(int bus, struct pci_region *reg) * If fewer than three regions are requested, then the region * list is terminated with a region of size 0. */ -void mpc83xx_pci_init(int num_buses, struct pci_region **reg, int warmboot) +void mpc83xx_pci_init(int num_buses, struct pci_region **reg) { volatile immap_t *immr = (volatile immap_t *)CONFIG_SYS_IMMR; int i; @@ -150,9 +150,9 @@ void mpc83xx_pci_init(int num_buses, struct pci_region **reg, int warmboot) /* * Release PCI RST Output signal. * Power on to RST high must be at least 100 ms as per PCI spec. - * On warm boots only 1 ms is required. + * On warm boots only 1 ms is required, but we play it safe. */ - udelay(warmboot ? 1000 : 100000); + udelay(100000);
for (i = 0; i < num_buses; i++) immr->pci_ctrl[i].gcr = 1; diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c index 77f8906..51f0488 100644 --- a/arch/powerpc/cpu/mpc83xx/pcie.c +++ b/arch/powerpc/cpu/mpc83xx/pcie.c @@ -301,16 +301,16 @@ static void mpc83xx_pcie_init_bus(int bus, struct pci_region *reg) * The caller must have already set SCCR, SERDES and the PCIE_LAW BARs * must have been set to cover all of the requested regions. */ -void mpc83xx_pcie_init(int num_buses, struct pci_region **reg, int warmboot) +void mpc83xx_pcie_init(int num_buses, struct pci_region **reg) { int i;
/* * Release PCI RST Output signal. * Power on to RST high must be at least 100 ms as per PCI spec. - * On warm boots only 1 ms is required. + * On warm boots only 1 ms is required, but we play it safe. */ - udelay(warmboot ? 1000 : 100000); + udelay(100000);
for (i = 0; i < num_buses; i++) mpc83xx_pcie_init_bus(i, reg[i]); diff --git a/board/esd/vme8349/pci.c b/board/esd/vme8349/pci.c index 94fd32a..2802be1 100644 --- a/board/esd/vme8349/pci.c +++ b/board/esd/vme8349/pci.c @@ -124,7 +124,7 @@ pci_init_board(void) udelay(2000);
if (monarch == 0) { - mpc83xx_pci_init(1, reg, 0); + mpc83xx_pci_init(1, reg); } else { /* * Release PCI RST Output signal diff --git a/board/freescale/mpc8308rdb/mpc8308rdb.c b/board/freescale/mpc8308rdb/mpc8308rdb.c index a864189..c6af63b 100644 --- a/board/freescale/mpc8308rdb/mpc8308rdb.c +++ b/board/freescale/mpc8308rdb/mpc8308rdb.c @@ -114,7 +114,7 @@ void pci_init_board(void) out_be32(&pcie_law[0].bar, CONFIG_SYS_PCIE1_BASE & LAWBAR_BAR); out_be32(&pcie_law[0].ar, LBLAWAR_EN | LBLAWAR_512MB);
- mpc83xx_pcie_init(1, pcie_reg, 0); + mpc83xx_pcie_init(1, pcie_reg); } /* * Miscellaneous late-boot configurations diff --git a/board/freescale/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c index e5f62ae..08f873d 100644 --- a/board/freescale/mpc8313erdb/mpc8313erdb.c +++ b/board/freescale/mpc8313erdb/mpc8313erdb.c @@ -80,7 +80,6 @@ void pci_init_board(void) volatile clk83xx_t *clk = (volatile clk83xx_t *)&immr->clk; volatile law83xx_t *pci_law = immr->sysconf.pcilaw; struct pci_region *reg[] = { pci_regions }; - int warmboot;
/* Enable all 3 PCI_CLK_OUTPUTs. */ clk->occr |= 0xe0000000; @@ -94,12 +93,7 @@ void pci_init_board(void) pci_law[1].bar = CONFIG_SYS_PCI1_IO_PHYS & LAWBAR_BAR; pci_law[1].ar = LBLAWAR_EN | LBLAWAR_1MB;
- warmboot = gd->bd->bi_bootflags & BOOTFLAG_WARM; -#ifndef CONFIG_SYS_8313ERDB_BROKEN_PMC - warmboot |= immr->pmc.pmccr1 & PMCCR1_POWER_OFF; -#endif - - mpc83xx_pci_init(1, reg, warmboot); + mpc83xx_pci_init(1, reg); }
/* diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c index d5e71dc..5dc558a 100644 --- a/board/freescale/mpc8315erdb/mpc8315erdb.c +++ b/board/freescale/mpc8315erdb/mpc8315erdb.c @@ -140,7 +140,6 @@ void pci_init_board(void) volatile law83xx_t *pcie_law = sysconf->pcielaw; struct pci_region *reg[] = { pci_regions }; struct pci_region *pcie_reg[] = { pcie_regions_0, pcie_regions_1, }; - int warmboot;
/* Enable all 3 PCI_CLK_OUTPUTs. */ clk->occr |= 0xe0000000; @@ -154,10 +153,7 @@ void pci_init_board(void) pci_law[1].bar = CONFIG_SYS_PCI_IO_PHYS & LAWBAR_BAR; pci_law[1].ar = LBLAWAR_EN | LBLAWAR_1MB;
- warmboot = gd->bd->bi_bootflags & BOOTFLAG_WARM; - warmboot |= immr->pmc.pmccr1 & PMCCR1_POWER_OFF; - - mpc83xx_pci_init(1, reg, warmboot); + mpc83xx_pci_init(1, reg);
/* Configure the clock for PCIE controller */ clrsetbits_be32(&clk->sccr, SCCR_PCIEXP1CM | SCCR_PCIEXP2CM, @@ -175,7 +171,7 @@ void pci_init_board(void) out_be32(&pcie_law[1].bar, CONFIG_SYS_PCIE2_BASE & LAWBAR_BAR); out_be32(&pcie_law[1].ar, LBLAWAR_EN | LBLAWAR_512MB);
- mpc83xx_pcie_init(2, pcie_reg, warmboot); + mpc83xx_pcie_init(2, pcie_reg); }
#if defined(CONFIG_OF_BOARD_SETUP) diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c index 8680a19..7a0ff18 100644 --- a/board/freescale/mpc8323erdb/mpc8323erdb.c +++ b/board/freescale/mpc8323erdb/mpc8323erdb.c @@ -173,7 +173,7 @@ void pci_init_board(void) pci_law[1].bar = CONFIG_SYS_PCI1_IO_PHYS & LAWBAR_BAR; pci_law[1].ar = LBLAWAR_EN | LBLAWAR_1MB;
- mpc83xx_pci_init(1, reg, 0); + mpc83xx_pci_init(1, reg); }
#if defined(CONFIG_OF_BOARD_SETUP) diff --git a/board/freescale/mpc832xemds/pci.c b/board/freescale/mpc832xemds/pci.c index e1dd757..5c7901d 100644 --- a/board/freescale/mpc832xemds/pci.c +++ b/board/freescale/mpc832xemds/pci.c @@ -86,7 +86,7 @@ void pci_init_board(void) pci_law[1].bar = CONFIG_SYS_PCI1_IO_PHYS & LAWBAR_BAR; pci_law[1].ar = LAWAR_EN | LAWAR_SIZE_4M;
- mpc83xx_pci_init(1, reg, 0); + mpc83xx_pci_init(1, reg);
/* * Configure PCI Inbound Translation Windows @@ -147,9 +147,9 @@ void pci_init_board(void) udelay(2000);
#ifndef CONFIG_MPC83XX_PCI2 - mpc83xx_pci_init(1, reg, 0); + mpc83xx_pci_init(1, reg); #else - mpc83xx_pci_init(2, reg, 0); + mpc83xx_pci_init(2, reg); #endif } #endif /* CONFIG_PCISLAVE */ diff --git a/board/freescale/mpc8349emds/pci.c b/board/freescale/mpc8349emds/pci.c index 9293f70..832477f 100644 --- a/board/freescale/mpc8349emds/pci.c +++ b/board/freescale/mpc8349emds/pci.c @@ -161,9 +161,9 @@ void pci_init_board(void) udelay(2000);
#ifndef CONFIG_MPC83XX_PCI2 - mpc83xx_pci_init(1, reg, 0); + mpc83xx_pci_init(1, reg); #else - mpc83xx_pci_init(2, reg, 0); + mpc83xx_pci_init(2, reg); #endif }
@@ -182,7 +182,7 @@ void pci_init_board(void) pci_law[1].bar = CONFIG_SYS_PCI1_IO_PHYS & LAWBAR_BAR; pci_law[1].ar = LAWAR_EN | LAWAR_SIZE_4M;
- mpc83xx_pci_init(1, reg, 0); + mpc83xx_pci_init(1, reg);
/* Configure PCI Inbound Translation Windows (3 1MB windows) */ pci_ctrl->pitar0 = 0x0; diff --git a/board/freescale/mpc8349itx/pci.c b/board/freescale/mpc8349itx/pci.c index 38baff3..7d30d9b 100644 --- a/board/freescale/mpc8349itx/pci.c +++ b/board/freescale/mpc8349itx/pci.c @@ -114,8 +114,8 @@ void pci_init_board(void) udelay(2000);
#ifndef CONFIG_MPC83XX_PCI2 - mpc83xx_pci_init(1, reg, 0); + mpc83xx_pci_init(1, reg); #else - mpc83xx_pci_init(2, reg, 0); + mpc83xx_pci_init(2, reg); #endif } diff --git a/board/freescale/mpc8360emds/pci.c b/board/freescale/mpc8360emds/pci.c index 04a802b..c3a8663 100644 --- a/board/freescale/mpc8360emds/pci.c +++ b/board/freescale/mpc8360emds/pci.c @@ -84,7 +84,7 @@ void pci_init_board(void) pci_law[1].bar = CONFIG_SYS_PCI1_IO_PHYS & LAWBAR_BAR; pci_law[1].ar = LAWAR_EN | LAWAR_SIZE_1M;
- mpc83xx_pci_init(1, reg, 0); + mpc83xx_pci_init(1, reg);
/* * Configure PCI Inbound Translation Windows @@ -145,9 +145,9 @@ void pci_init_board(void) udelay(2000);
#ifndef CONFIG_MPC83XX_PCI2 - mpc83xx_pci_init(1, reg, 0); + mpc83xx_pci_init(1, reg); #else - mpc83xx_pci_init(2, reg, 0); + mpc83xx_pci_init(2, reg); #endif } #endif /* CONFIG_PCISLAVE */ diff --git a/board/freescale/mpc8360erdk/mpc8360erdk.c b/board/freescale/mpc8360erdk/mpc8360erdk.c index 3771878..a6530d1 100644 --- a/board/freescale/mpc8360erdk/mpc8360erdk.c +++ b/board/freescale/mpc8360erdk/mpc8360erdk.c @@ -344,7 +344,7 @@ void pci_init_board(void) pci_law[1].bar = CONFIG_SYS_PCI1_IO_PHYS & LAWBAR_BAR; pci_law[1].ar = LBLAWAR_EN | LBLAWAR_1MB;
- mpc83xx_pci_init(1, reg, 0); + mpc83xx_pci_init(1, reg); }
#if defined(CONFIG_OF_BOARD_SETUP) diff --git a/board/freescale/mpc837xemds/pci.c b/board/freescale/mpc837xemds/pci.c index 82f34f8..77c5bda 100644 --- a/board/freescale/mpc837xemds/pci.c +++ b/board/freescale/mpc837xemds/pci.c @@ -108,7 +108,7 @@ void pci_init_board(void)
udelay(2000);
- mpc83xx_pci_init(1, reg, 0); + mpc83xx_pci_init(1, reg); skip_pci: /* There is no PEX in MPC8379 parts. */ if (PARTID_NO_E(spridr) == SPR_8379) diff --git a/board/freescale/mpc837xerdb/pci.c b/board/freescale/mpc837xerdb/pci.c index 97ad227..3512bd4 100644 --- a/board/freescale/mpc837xerdb/pci.c +++ b/board/freescale/mpc837xerdb/pci.c @@ -88,7 +88,7 @@ void pci_init_board(void) pci_law[1].bar = CONFIG_SYS_PCI_IO_PHYS & LAWBAR_BAR; pci_law[1].ar = LBLAWAR_EN | LBLAWAR_1MB;
- mpc83xx_pci_init(1, reg, 0); + mpc83xx_pci_init(1, reg);
/* There is no PEX in MPC8379 parts. */ if (PARTID_NO_E(spridr) == SPR_8379) @@ -110,5 +110,5 @@ void pci_init_board(void) out_be32(&pcie_law[1].bar, CONFIG_SYS_PCIE2_BASE & LAWBAR_BAR); out_be32(&pcie_law[1].ar, LBLAWAR_EN | LBLAWAR_512MB);
- mpc83xx_pcie_init(2, pcie_reg, 0); + mpc83xx_pcie_init(2, pcie_reg); } diff --git a/board/matrix_vision/mvblm7/pci.c b/board/matrix_vision/mvblm7/pci.c index 1cc524b..921e80b 100644 --- a/board/matrix_vision/mvblm7/pci.c +++ b/board/matrix_vision/mvblm7/pci.c @@ -60,7 +60,6 @@ static struct pci_region pci_regions[] = { void pci_init_board(void) { int i; - int warmboot; volatile immap_t *immr; volatile pcictrl83xx_t *pci_ctrl; volatile gpio83xx_t *gpio; @@ -102,7 +101,5 @@ void pci_init_board(void) pci_law[1].bar = CONFIG_SYS_PCI1_IO_PHYS & LAWBAR_BAR; pci_law[1].ar = LBLAWAR_EN | LBLAWAR_1MB;
- warmboot = gd->bd->bi_bootflags & BOOTFLAG_WARM; - - mpc83xx_pci_init(1, reg, warmboot); + mpc83xx_pci_init(1, reg); } diff --git a/board/sbc8349/pci.c b/board/sbc8349/pci.c index ca53356..e06874c 100644 --- a/board/sbc8349/pci.c +++ b/board/sbc8349/pci.c @@ -84,5 +84,5 @@ pci_init_board(void)
udelay(2000);
- mpc83xx_pci_init(1, reg, 0); + mpc83xx_pci_init(1, reg); } diff --git a/board/sheldon/simpc8313/simpc8313.c b/board/sheldon/simpc8313/simpc8313.c index c2164c9..9126c42 100644 --- a/board/sheldon/simpc8313/simpc8313.c +++ b/board/sheldon/simpc8313/simpc8313.c @@ -67,7 +67,6 @@ void pci_init_board(void) volatile clk83xx_t *clk = (volatile clk83xx_t *)&immr->clk; volatile law83xx_t *pci_law = immr->sysconf.pcilaw; struct pci_region *reg[] = { pci_regions }; - int warmboot;
/* Enable all 3 PCI_CLK_OUTPUTs. */ clk->occr |= 0xe0000000; @@ -81,9 +80,7 @@ void pci_init_board(void) pci_law[1].bar = CONFIG_SYS_PCI1_IO_PHYS & LAWBAR_BAR; pci_law[1].ar = LBLAWAR_EN | LBLAWAR_1MB;
- warmboot = gd->bd->bi_bootflags & BOOTFLAG_WARM; - - mpc83xx_pci_init(1, reg, warmboot); + mpc83xx_pci_init(1, reg); }
/* diff --git a/board/tqc/tqm834x/pci.c b/board/tqc/tqm834x/pci.c index fcf4379..f35ea89 100644 --- a/board/tqc/tqm834x/pci.c +++ b/board/tqc/tqm834x/pci.c @@ -112,5 +112,5 @@ pci_init_board(void)
udelay(2000);
- mpc83xx_pci_init(1, reg, 0); + mpc83xx_pci_init(1, reg); } diff --git a/board/ve8313/ve8313.c b/board/ve8313/ve8313.c index 2272ff0..166e459 100644 --- a/board/ve8313/ve8313.c +++ b/board/ve8313/ve8313.c @@ -184,7 +184,6 @@ void pci_init_board(void) volatile clk83xx_t *clk = (volatile clk83xx_t *)&immr->clk; volatile law83xx_t *pci_law = immr->sysconf.pcilaw; struct pci_region *reg[] = { pci_regions }; - int warmboot;
/* Enable all 3 PCI_CLK_OUTPUTs. */ setbits_be32(&clk->occr, 0xe0000000); @@ -198,9 +197,7 @@ void pci_init_board(void) out_be32(&pci_law[1].bar, CONFIG_SYS_PCI1_IO_PHYS & LAWBAR_BAR); out_be32(&pci_law[1].ar, LBLAWAR_EN | LBLAWAR_1MB);
- warmboot = gd->bd->bi_bootflags & BOOTFLAG_WARM; - - mpc83xx_pci_init(1, reg, warmboot); + mpc83xx_pci_init(1, reg); } #endif
diff --git a/include/mpc83xx.h b/include/mpc83xx.h index ba6cdf1..619bd32 100644 --- a/include/mpc83xx.h +++ b/include/mpc83xx.h @@ -1216,9 +1216,9 @@
#ifndef __ASSEMBLY__ struct pci_region; -void mpc83xx_pci_init(int num_buses, struct pci_region **reg, int warmboot); +void mpc83xx_pci_init(int num_buses, struct pci_region **reg); void mpc83xx_pcislave_unlock(int bus); -void mpc83xx_pcie_init(int num_buses, struct pci_region **reg, int warmboot); +void mpc83xx_pcie_init(int num_buses, struct pci_region **reg); #endif
#endif /* __MPC83XX_H__ */
This puts the board info struct in a known state and allows the removal of other code which initialized board info fields to 0.
Signed-off-by: Peter Tyser ptyser@xes-inc.com --- arch/powerpc/lib/board.c | 17 +---------------- 1 files changed, 1 insertions(+), 16 deletions(-)
diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index 950680c..a6dd1b4 100644 --- a/arch/powerpc/lib/board.c +++ b/arch/powerpc/lib/board.c @@ -480,6 +480,7 @@ void board_init_f (ulong bootflag) */ addr_sp -= sizeof (bd_t); bd = (bd_t *) addr_sp; + memset(bd, 0, sizeof(bd_t)); gd->bd = bd; debug ("Reserving %zu Bytes for Board Info at: %08lx\n", sizeof (bd_t), addr_sp); @@ -512,9 +513,6 @@ void board_init_f (ulong bootflag) #ifdef CONFIG_SYS_SRAM_BASE bd->bi_sramstart = CONFIG_SYS_SRAM_BASE; /* start of SRAM memory */ bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE; /* size of SRAM memory */ -#else - bd->bi_sramstart = 0; - bd->bi_sramsize = 0; #endif
#if defined(CONFIG_8xx) || defined(CONFIG_8260) || defined(CONFIG_5xx) || \ @@ -740,14 +738,7 @@ void board_init_r (gd_t *id, ulong dest_addr) bd->bi_flashoffset = TEXT_BASE + flash_size; # elif CONFIG_SYS_MONITOR_BASE == CONFIG_SYS_FLASH_BASE bd->bi_flashoffset = monitor_flash_len; /* reserved area for startup monitor */ -# else - bd->bi_flashoffset = 0; # endif -#else /* CONFIG_SYS_NO_FLASH */ - - bd->bi_flashsize = 0; - bd->bi_flashstart = 0; - bd->bi_flashoffset = 0; #endif /* !CONFIG_SYS_NO_FLASH */
WATCHDOG_RESET (); @@ -793,14 +784,8 @@ void board_init_r (gd_t *id, ulong dest_addr) if (s && ((*s == 'y') || (*s == 'Y'))) { bd->bi_iic_fast[0] = 1; bd->bi_iic_fast[1] = 1; - } else { - bd->bi_iic_fast[0] = 0; - bd->bi_iic_fast[1] = 0; } } -#else - bd->bi_iic_fast[0] = 0; - bd->bi_iic_fast[1] = 0; #endif /* CONFIG_I2CFAST */ #endif /* CONFIG_405GP, CONFIG_405EP */ #endif /* CONFIG_SYS_EXTBDINFO */
Dear Peter Tyser,
In message 1284509634-11899-2-git-send-email-ptyser@xes-inc.com you wrote:
This puts the board info struct in a known state and allows the removal of other code which initialized board info fields to 0.
Signed-off-by: Peter Tyser ptyser@xes-inc.com
arch/powerpc/lib/board.c | 17 +---------------- 1 files changed, 1 insertions(+), 16 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Previously the _warm_start label was used as an entry point. These 2 entry points should be functionally identical after the removal of the BOOTFLAG_WARM define.
Signed-off-by: Peter Tyser ptyser@xes-inc.com --- board/ppmc7xx/ppmc7xx.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/board/ppmc7xx/ppmc7xx.c b/board/ppmc7xx/ppmc7xx.c index 0cad897..5e7427f 100644 --- a/board/ppmc7xx/ppmc7xx.c +++ b/board/ppmc7xx/ppmc7xx.c @@ -19,8 +19,7 @@
/* Function prototypes */ -extern void unlock_ram_in_cache( void ); -extern void _start_warm(void); +extern void _start(void);
/* @@ -97,8 +96,8 @@ void do_reset( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] ) icache_disable(); dcache_disable();
- /* Jump to warm start (in RAM) */ - _start_warm(); + /* Jump to cold reset point (in RAM) */ + _start();
/* Should never get here */ while(1);
Dear Peter Tyser,
In message 1284509634-11899-3-git-send-email-ptyser@xes-inc.com you wrote:
Previously the _warm_start label was used as an entry point. These 2 entry points should be functionally identical after the removal of the BOOTFLAG_WARM define.
Signed-off-by: Peter Tyser ptyser@xes-inc.com
board/ppmc7xx/ppmc7xx.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
No boards utilize the warm reset entry point, so remove it.
Signed-off-by: Peter Tyser ptyser@xes-inc.com --- arch/powerpc/cpu/74xx_7xx/start.S | 16 +--------------- arch/powerpc/cpu/mpc512x/start.S | 3 --- arch/powerpc/cpu/mpc5xx/start.S | 16 ++-------------- arch/powerpc/cpu/mpc5xxx/start.S | 17 ++--------------- arch/powerpc/cpu/mpc8220/start.S | 17 ++--------------- arch/powerpc/cpu/mpc824x/start.S | 17 ++--------------- arch/powerpc/cpu/mpc8260/start.S | 18 +++--------------- arch/powerpc/cpu/mpc83xx/start.S | 19 +++---------------- arch/powerpc/cpu/mpc85xx/start.S | 2 ++ arch/powerpc/cpu/mpc86xx/start.S | 15 +-------------- arch/powerpc/cpu/mpc8xx/start.S | 16 ++-------------- arch/powerpc/cpu/ppc4xx/start.S | 6 +++++- 12 files changed, 25 insertions(+), 137 deletions(-)
diff --git a/arch/powerpc/cpu/74xx_7xx/start.S b/arch/powerpc/cpu/74xx_7xx/start.S index a36af5a..47694aa 100644 --- a/arch/powerpc/cpu/74xx_7xx/start.S +++ b/arch/powerpc/cpu/74xx_7xx/start.S @@ -94,17 +94,7 @@ version_string: . = EXC_OFF_SYS_RESET .globl _start _start: - li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH */ b boot_cold - sync - - . = EXC_OFF_SYS_RESET + 0x10 - - .globl _start_warm -_start_warm: - li r21, BOOTFLAG_WARM /* Software reboot */ - b boot_warm - sync
/* the boot code is located below the exception table */
@@ -188,7 +178,6 @@ _end_of_vectors: . = 0x2000
boot_cold: -boot_warm: /* disable everything */ li r0, 0 mtspr HID0, r0 @@ -288,14 +277,11 @@ in_flash: bl cpu_init_f sync
- mr r3, r21 - - /* r3: BOOTFLAG */ /* run 1st part of board init code (from Flash) */ bl board_init_f sync
- /* NOTREACHED */ + /* NOTREACHED - board_init_f() does not return */
.globl invalidate_bats invalidate_bats: diff --git a/arch/powerpc/cpu/mpc512x/start.S b/arch/powerpc/cpu/mpc512x/start.S index d26b617..1047c51 100644 --- a/arch/powerpc/cpu/mpc512x/start.S +++ b/arch/powerpc/cpu/mpc512x/start.S @@ -100,7 +100,6 @@ version_string: .globl _start /* Start from here after reset/power on */ _start: - li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH */ b boot_cold
.globl _start_of_vectors @@ -260,8 +259,6 @@ in_flash: /* run low-level CPU init code (in Flash) */ bl cpu_init_f
- /* r3: BOOTFLAG */ - mr r3, r21 /* run 1st part of board init code (in Flash) */ bl board_init_f
diff --git a/arch/powerpc/cpu/mpc5xx/start.S b/arch/powerpc/cpu/mpc5xx/start.S index 0af879e..4fd9b63 100644 --- a/arch/powerpc/cpu/mpc5xx/start.S +++ b/arch/powerpc/cpu/mpc5xx/start.S @@ -91,18 +91,6 @@ _start: li r4, CONFIG_SYS_ISB /* Set ISB bit */ or r3, r3, r4 mtspr 638, r3 - li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH */ - b boot_cold - - . = EXC_OFF_SYS_RESET + 0x20 - - .globl _start_warm -_start_warm: - li r21, BOOTFLAG_WARM /* Software reboot */ - b boot_warm - -boot_cold: -boot_warm:
/* Initialize machine status; enable machine check interrupt */ /*----------------------------------------------------------------------*/ @@ -188,10 +176,10 @@ in_flash: /* r3: IMMR */ bl cpu_init_f /* run low-level CPU init code (from Flash) */
- mr r3, r21 - /* r3: BOOTFLAG */ bl board_init_f /* run 1st part of board init code (from Flash) */
+ /* NOTREACHED - board_init_f() does not return */ +
.globl _start_of_vectors _start_of_vectors: diff --git a/arch/powerpc/cpu/mpc5xxx/start.S b/arch/powerpc/cpu/mpc5xxx/start.S index 8b9f09b..1385869 100644 --- a/arch/powerpc/cpu/mpc5xxx/start.S +++ b/arch/powerpc/cpu/mpc5xxx/start.S @@ -89,19 +89,6 @@ version_string: . = EXC_OFF_SYS_RESET .globl _start _start: - li r21, BOOTFLAG_COLD /* Normal Power-On */ - nop - b boot_cold - - . = EXC_OFF_SYS_RESET + 0x10 - - .globl _start_warm -_start_warm: - li r21, BOOTFLAG_WARM /* Software reboot */ - b boot_warm - -boot_cold: -boot_warm: mfmsr r5 /* save msr contents */
/* Move CSBoot and adjust instruction pointer */ @@ -175,10 +162,10 @@ lowboot_reentry: /* r3: IMMR */ bl cpu_init_f /* run low-level CPU init code (in Flash)*/
- mr r3, r21 - /* r3: BOOTFLAG */ bl board_init_f /* run 1st part of board init code (in Flash)*/
+ /* NOTREACHED - board_init_f() does not return */ + /* * Vector Table */ diff --git a/arch/powerpc/cpu/mpc8220/start.S b/arch/powerpc/cpu/mpc8220/start.S index 3d79d8e..c156e25 100644 --- a/arch/powerpc/cpu/mpc8220/start.S +++ b/arch/powerpc/cpu/mpc8220/start.S @@ -88,19 +88,6 @@ version_string: . = EXC_OFF_SYS_RESET .globl _start _start: - li r21, BOOTFLAG_COLD /* Normal Power-On */ - nop - b boot_cold - - . = EXC_OFF_SYS_RESET + 0x10 - - .globl _start_warm -_start_warm: - li r21, BOOTFLAG_WARM /* Software reboot */ - b boot_warm - -boot_cold: -boot_warm: mfmsr r5 /* save msr contents */
/* replace default MBAR base address from 0x80000000 @@ -144,10 +131,10 @@ boot_warm: /* r3: IMMR */ bl cpu_init_f /* run low-level CPU init code (in Flash)*/
- mr r3, r21 - /* r3: BOOTFLAG */ bl board_init_f /* run 1st part of board init code (in Flash)*/
+ /* NOTREACHED - board_init_f() does not return */ + /* * Vector Table */ diff --git a/arch/powerpc/cpu/mpc824x/start.S b/arch/powerpc/cpu/mpc824x/start.S index f3f595a..5b126bb 100644 --- a/arch/powerpc/cpu/mpc824x/start.S +++ b/arch/powerpc/cpu/mpc824x/start.S @@ -97,19 +97,6 @@ version_string: . = EXC_OFF_SYS_RESET .globl _start _start: - li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH */ - b boot_cold - - . = EXC_OFF_SYS_RESET + 0x10 - - .globl _start_warm -_start_warm: - li r21, BOOTFLAG_WARM /* Software reboot */ - b boot_warm - -boot_cold: -boot_warm: - /* Initialize machine status; enable machine check interrupt */ /*----------------------------------------------------------------------*/ li r3, MSR_KERNEL /* Set FP, ME, RI flags */ @@ -198,10 +185,10 @@ in_flash: /* r3: IMMR */ bl cpu_init_f /* run low-level CPU init code (from Flash) */
- mr r3, r21 - /* r3: BOOTFLAG */ bl board_init_f /* run 1st part of board init code (from Flash) */
+ /* NOTREACHED - board_init_f() does not return */ +
.globl _start_of_vectors _start_of_vectors: diff --git a/arch/powerpc/cpu/mpc8260/start.S b/arch/powerpc/cpu/mpc8260/start.S index a435042..9485afa 100644 --- a/arch/powerpc/cpu/mpc8260/start.S +++ b/arch/powerpc/cpu/mpc8260/start.S @@ -161,18 +161,6 @@ _hrcw_table:
.globl _start _start: - li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH*/ - nop - b boot_cold - - . = EXC_OFF_SYS_RESET + 0x10 - - .globl _start_warm -_start_warm: - li r21, BOOTFLAG_WARM /* Software reboot */ - b boot_warm - -boot_cold: #if defined(CONFIG_MPC8260ADS) && defined(CONFIG_SYS_DEFAULT_IMMR) lis r3, CONFIG_SYS_DEFAULT_IMMR@h nop @@ -185,7 +173,7 @@ boot_cold: stw r4, 0(r3) nop #endif /* CONFIG_MPC8260ADS && CONFIG_SYS_DEFAULT_IMMR */ -boot_warm: + mfmsr r5 /* save msr contents */
#if defined(CONFIG_COGENT) @@ -254,10 +242,10 @@ in_flash: bl init_debug /* set up debugging stuff */ #endif
- mr r3, r21 - /* r3: BOOTFLAG */ bl board_init_f /* run 1st part of board init code (in Flash)*/
+ /* NOTREACHED - board_init_f() does not return */ + /* * Vector Table */ diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S index c7d85a8..bdce915 100644 --- a/arch/powerpc/cpu/mpc83xx/start.S +++ b/arch/powerpc/cpu/mpc83xx/start.S @@ -183,22 +183,9 @@ ppcDWload:
.globl _start _start: /* time t 0 */ - li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH*/ - nop - b boot_cold - - . = EXC_OFF_SYS_RESET + 0x10 - - .globl _start_warm -_start_warm: - li r21, BOOTFLAG_WARM /* Software reboot */ - b boot_warm - - -boot_cold: /* time t 3 */ lis r4, CONFIG_DEFAULT_IMMR@h nop -boot_warm: /* time t 5 */ + mfmsr r5 /* save msr contents */
/* 83xx manuals prescribe a specific sequence for updating IMMRBAR. */ @@ -302,11 +289,11 @@ in_flash: /* run low-level CPU init code (in Flash)*/ bl cpu_init_f
- /* r3: BOOTFLAG */ - mr r3, r21 /* run 1st part of board init code (in Flash)*/ bl board_init_f
+ /* NOTREACHED - board_init_f() does not return */ + #ifndef CONFIG_NAND_SPL /* * Vector Table diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index 3278b10..91096ad 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -432,6 +432,8 @@ _start_cont: bl board_init_f isync
+ /* NOTREACHED - board_init_f() does not return */ + #ifndef CONFIG_NAND_SPL . = EXC_OFF_SYS_RESET .globl _start_of_vectors diff --git a/arch/powerpc/cpu/mpc86xx/start.S b/arch/powerpc/cpu/mpc86xx/start.S index ed1e4ca..596053f 100644 --- a/arch/powerpc/cpu/mpc86xx/start.S +++ b/arch/powerpc/cpu/mpc86xx/start.S @@ -83,17 +83,7 @@ version_string: . = EXC_OFF_SYS_RESET .globl _start _start: - li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH */ b boot_cold - sync - - . = EXC_OFF_SYS_RESET + 0x10 - - .globl _start_warm -_start_warm: - li r21, BOOTFLAG_WARM /* Software reboot */ - b boot_warm - sync
/* the boot code is located below the exception table */
@@ -166,7 +156,6 @@ _end_of_vectors: . = 0x2000
boot_cold: -boot_warm: /* * NOTE: Only Cpu 0 will ever come here. Other cores go to an * address specified by the BPTR @@ -303,14 +292,12 @@ diag_done: #endif
/* bl l2cache_enable */ - mr r3, r21
- /* r3: BOOTFLAG */ /* run 1st part of board init code (from Flash) */ bl board_init_f sync
- /* NOTREACHED */ + /* NOTREACHED - board_init_f() does not return */
.globl invalidate_bats invalidate_bats: diff --git a/arch/powerpc/cpu/mpc8xx/start.S b/arch/powerpc/cpu/mpc8xx/start.S index 7cf602f..d6100ec 100644 --- a/arch/powerpc/cpu/mpc8xx/start.S +++ b/arch/powerpc/cpu/mpc8xx/start.S @@ -96,18 +96,6 @@ version_string: _start: lis r3, CONFIG_SYS_IMMR@h /* position IMMR */ mtspr 638, r3 - li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH */ - b boot_cold - - . = EXC_OFF_SYS_RESET + 0x10 - - .globl _start_warm -_start_warm: - li r21, BOOTFLAG_WARM /* Software reboot */ - b boot_warm - -boot_cold: -boot_warm:
/* Initialize machine status; enable machine check interrupt */ /*----------------------------------------------------------------------*/ @@ -202,10 +190,10 @@ in_flash: /* r3: IMMR */ bl cpu_init_f /* run low-level CPU init code (from Flash) */
- mr r3, r21 - /* r3: BOOTFLAG */ bl board_init_f /* run 1st part of board init code (from Flash) */
+ /* NOTREACHED - board_init_f() does not return */ +
.globl _start_of_vectors _start_of_vectors: diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S index 4bad32f..439bffb 100644 --- a/arch/powerpc/cpu/ppc4xx/start.S +++ b/arch/powerpc/cpu/ppc4xx/start.S @@ -261,6 +261,7 @@ GET_GOT bl cpu_init_f /* run low-level CPU init code (from Flash) */ bl board_init_f + /* NOTREACHED - board_init_f() does not return */ #endif
#if defined(CONFIG_SYS_RAMBOOT) @@ -797,6 +798,7 @@ _start:
bl cpu_init_f /* run low-level CPU init code (from Flash) */ bl board_init_f + /* NOTREACHED - board_init_f() does not return */ #endif
#endif /* CONFIG_440 */ @@ -905,6 +907,7 @@ _start: GET_GOT /* initialize GOT access */
bl board_init_f /* run first part of init code (from Flash) */ + /* NOTREACHED - board_init_f() does not return */
#endif /* CONFIG_IOP480 */
@@ -1174,8 +1177,9 @@ _start:
bl cpu_init_f /* run low-level CPU init code (from Flash) */
- /* NEVER RETURNS! */ bl board_init_f /* run first part of init code (from Flash) */ + /* NOTREACHED - board_init_f() does not return */ + #endif /* CONFIG_NAND_SPL */
#endif /* CONFIG_405GP || CONFIG_405CR || CONFIG_405 || CONFIG_405EP */
Dear Peter Tyser,
In message 1284509634-11899-4-git-send-email-ptyser@xes-inc.com you wrote:
No boards utilize the warm reset entry point, so remove it.
Signed-off-by: Peter Tyser ptyser@xes-inc.com
arch/powerpc/cpu/74xx_7xx/start.S | 16 +--------------- arch/powerpc/cpu/mpc512x/start.S | 3 --- arch/powerpc/cpu/mpc5xx/start.S | 16 ++-------------- arch/powerpc/cpu/mpc5xxx/start.S | 17 ++--------------- arch/powerpc/cpu/mpc8220/start.S | 17 ++--------------- arch/powerpc/cpu/mpc824x/start.S | 17 ++--------------- arch/powerpc/cpu/mpc8260/start.S | 18 +++--------------- arch/powerpc/cpu/mpc83xx/start.S | 19 +++---------------- arch/powerpc/cpu/mpc85xx/start.S | 2 ++ arch/powerpc/cpu/mpc86xx/start.S | 15 +-------------- arch/powerpc/cpu/mpc8xx/start.S | 16 ++-------------- arch/powerpc/cpu/ppc4xx/start.S | 6 +++++- 12 files changed, 25 insertions(+), 137 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Now that warm booting is not supported, there isn't a need for the BOOTFLAG_COLD and BOOTFLAG_WARM defines, so remove them.
Note that this change makes the board info bd_bootflags field useless. It will always be set to 0, but we leave it around so that we don't break the board info structure that some OSes are expecting to be passed from U-Boot.
Signed-off-by: Peter Tyser ptyser@xes-inc.com --- arch/powerpc/cpu/74xx_7xx/start.S | 1 + arch/powerpc/cpu/mpc512x/start.S | 1 + arch/powerpc/cpu/mpc5xx/start.S | 1 + arch/powerpc/cpu/mpc5xxx/start.S | 1 + arch/powerpc/cpu/mpc8220/start.S | 1 + arch/powerpc/cpu/mpc824x/start.S | 1 + arch/powerpc/cpu/mpc8260/start.S | 1 + arch/powerpc/cpu/mpc83xx/start.S | 1 + arch/powerpc/cpu/mpc86xx/start.S | 1 + arch/powerpc/cpu/mpc8xx/start.S | 1 + arch/powerpc/include/asm/u-boot.h | 2 +- arch/powerpc/lib/board.c | 2 -- board/fads/fads.h | 8 -------- include/configs/A3000.h | 8 -------- include/configs/ADCIOP.h | 9 --------- include/configs/AMX860.h | 8 -------- include/configs/AP1000.h | 8 -------- include/configs/APC405.h | 8 -------- include/configs/AR405.h | 8 -------- include/configs/ASH405.h | 8 -------- include/configs/ATUM8548.h | 8 -------- include/configs/Adder.h | 8 -------- include/configs/Alaska8220.h | 3 --- include/configs/BAB7xx.h | 9 --------- include/configs/BC3450.h | 3 --- include/configs/BMW.h | 9 --------- include/configs/CANBT.h | 9 --------- include/configs/CATcenter.h | 9 --------- include/configs/CCM.h | 9 --------- include/configs/CMS700.h | 8 -------- include/configs/CPC45.h | 10 ---------- include/configs/CPCI2DP.h | 8 -------- include/configs/CPCI405.h | 9 --------- include/configs/CPCI4052.h | 9 --------- include/configs/CPCI405AB.h | 9 --------- include/configs/CPCI405DT.h | 8 -------- include/configs/CPCI750.h | 8 -------- include/configs/CPCIISER4.h | 8 -------- include/configs/CPU86.h | 9 --------- include/configs/CPU87.h | 9 --------- include/configs/CRAYL1.h | 8 -------- include/configs/CU824.h | 8 -------- include/configs/DASA_SIM.h | 9 --------- include/configs/DB64360.h | 8 -------- include/configs/DB64460.h | 8 -------- include/configs/DP405.h | 8 -------- include/configs/DU405.h | 9 --------- include/configs/DU440.h | 8 -------- include/configs/ELPPC.h | 8 -------- include/configs/ELPT860.h | 13 ------------- include/configs/EP88x.h | 8 -------- include/configs/ERIC.h | 8 -------- include/configs/ESTEEM192E.h | 18 ------------------ include/configs/ETX094.h | 9 --------- include/configs/EVB64260.h | 8 -------- include/configs/EXBITGEN.h | 8 -------- include/configs/FADS823.h | 8 -------- include/configs/FADS850SAR.h | 8 -------- include/configs/FLAGADM.h | 8 -------- include/configs/FPS850L.h | 9 --------- include/configs/FPS860L.h | 9 --------- include/configs/G2000.h | 8 -------- include/configs/GEN860T.h | 6 ------ include/configs/GENIETV.h | 8 -------- include/configs/HH405.h | 8 -------- include/configs/HIDDEN_DRAGON.h | 8 -------- include/configs/HMI10.h | 9 --------- include/configs/HUB405.h | 8 -------- include/configs/IAD210.h | 9 --------- include/configs/ICU862.h | 9 --------- include/configs/IDS8247.h | 9 --------- include/configs/IP860.h | 14 -------------- include/configs/IPHASE4539.h | 9 --------- include/configs/ISPAN.h | 8 -------- include/configs/IVML24.h | 9 --------- include/configs/IVMS8.h | 9 --------- include/configs/IceCube.h | 3 --- include/configs/JSE.h | 9 --------- include/configs/KAREF.h | 8 -------- include/configs/KUP4K.h | 9 --------- include/configs/KUP4X.h | 9 --------- include/configs/LANTEC.h | 8 -------- include/configs/MBX.h | 8 -------- include/configs/MBX860T.h | 8 -------- include/configs/METROBOX.h | 8 -------- include/configs/MHPC.h | 8 -------- include/configs/MIP405.h | 9 --------- include/configs/ML2.h | 8 -------- include/configs/MOUSSE.h | 9 --------- include/configs/MPC8260ADS.h | 3 --- include/configs/MPC8266ADS.h | 3 --- include/configs/MPC8308RDB.h | 8 -------- include/configs/MPC8313ERDB.h | 8 -------- include/configs/MPC8315ERDB.h | 8 -------- include/configs/MPC8323ERDB.h | 8 -------- include/configs/MPC832XEMDS.h | 8 -------- include/configs/MPC8349EMDS.h | 8 -------- include/configs/MPC8349ITX.h | 8 -------- include/configs/MPC8360EMDS.h | 8 -------- include/configs/MPC8360ERDK.h | 8 -------- include/configs/MPC837XEMDS.h | 8 -------- include/configs/MPC837XERDB.h | 8 -------- include/configs/MPC8536DS.h | 8 -------- include/configs/MPC8540ADS.h | 8 -------- include/configs/MPC8540EVAL.h | 8 -------- include/configs/MPC8541CDS.h | 8 -------- include/configs/MPC8544DS.h | 8 -------- include/configs/MPC8548CDS.h | 8 -------- include/configs/MPC8555CDS.h | 8 -------- include/configs/MPC8560ADS.h | 8 -------- include/configs/MPC8568MDS.h | 8 -------- include/configs/MPC8569MDS.h | 8 -------- include/configs/MPC8572DS.h | 8 -------- include/configs/MPC8610HPCD.h | 8 -------- include/configs/MPC8641HPCN.h | 8 -------- include/configs/MUSENKI.h | 8 -------- include/configs/MVBC_P.h | 3 --- include/configs/MVBLM7.h | 9 --------- include/configs/MVBLUE.h | 9 --------- include/configs/MVS1.h | 9 --------- include/configs/MVSMR.h | 3 --- include/configs/NC650.h | 8 -------- include/configs/NETPHONE.h | 8 -------- include/configs/NETTA.h | 8 -------- include/configs/NETTA2.h | 8 -------- include/configs/NETVIA.h | 8 -------- include/configs/NSCU.h | 9 --------- include/configs/NX823.h | 9 --------- include/configs/OCRTC.h | 9 --------- include/configs/ORSG.h | 9 --------- include/configs/OXC.h | 9 --------- include/configs/P1022DS.h | 8 -------- include/configs/P1_P2_RDB.h | 8 -------- include/configs/P2020DS.h | 8 -------- include/configs/P3G4.h | 8 -------- include/configs/PATI.h | 10 ---------- include/configs/PCI405.h | 8 -------- include/configs/PCIPPC2.h | 8 -------- include/configs/PCIPPC6.h | 8 -------- include/configs/PIP405.h | 9 --------- include/configs/PLU405.h | 8 -------- include/configs/PM520.h | 3 --- include/configs/PM826.h | 9 --------- include/configs/PM828.h | 9 --------- include/configs/PM854.h | 8 -------- include/configs/PM856.h | 8 -------- include/configs/PMC405.h | 8 -------- include/configs/PMC440.h | 8 -------- include/configs/PN62.h | 10 ---------- include/configs/PPChameleonEVB.h | 9 --------- include/configs/QS823.h | 8 -------- include/configs/QS850.h | 8 -------- include/configs/QS860T.h | 9 --------- include/configs/R360MPI.h | 9 --------- include/configs/RBC823.h | 9 --------- include/configs/RPXClassic.h | 9 --------- include/configs/RPXlite.h | 9 --------- include/configs/RPXlite_DW.h | 8 -------- include/configs/RPXsuper.h | 8 -------- include/configs/RRvision.h | 8 -------- include/configs/Rattler.h | 3 --- include/configs/SBC8540.h | 8 -------- include/configs/SCM.h | 9 --------- include/configs/SIMPC8313.h | 8 -------- include/configs/SM850.h | 9 --------- include/configs/SPD823TS.h | 8 -------- include/configs/SXNI855T.h | 7 ------- include/configs/Sandpoint8240.h | 10 ---------- include/configs/Sandpoint8245.h | 10 ---------- include/configs/TB5200.h | 3 --- include/configs/TK885D.h | 8 -------- include/configs/TOP5200.h | 3 --- include/configs/TOP860.h | 8 -------- include/configs/TQM5200.h | 3 --- include/configs/TQM823L.h | 9 --------- include/configs/TQM823M.h | 9 --------- include/configs/TQM8260.h | 9 --------- include/configs/TQM8272.h | 8 -------- include/configs/TQM834x.h | 8 -------- include/configs/TQM850L.h | 9 --------- include/configs/TQM850M.h | 9 --------- include/configs/TQM855L.h | 9 --------- include/configs/TQM855M.h | 9 --------- include/configs/TQM85xx.h | 8 -------- include/configs/TQM860L.h | 9 --------- include/configs/TQM860M.h | 8 -------- include/configs/TQM862L.h | 9 --------- include/configs/TQM862M.h | 9 --------- include/configs/TQM866M.h | 8 -------- include/configs/TQM885D.h | 8 -------- include/configs/Total5200.h | 3 --- include/configs/VOH405.h | 8 -------- include/configs/VOM405.h | 8 -------- include/configs/VoVPN-GW.h | 4 ---- include/configs/W7OLMC.h | 9 --------- include/configs/W7OLMG.h | 9 --------- include/configs/WUH405.h | 8 -------- include/configs/XPEDITE1000.h | 6 ------ include/configs/XPEDITE5170.h | 6 ------ include/configs/XPEDITE5200.h | 6 ------ include/configs/XPEDITE5370.h | 6 ------ include/configs/Yukon8220.h | 3 --- include/configs/ZPC1900.h | 3 --- include/configs/ZUMA.h | 8 -------- include/configs/aev.h | 3 --- include/configs/alpr.h | 8 -------- include/configs/aria.h | 8 -------- include/configs/atc.h | 8 -------- include/configs/barco.h | 9 --------- include/configs/c2mon.h | 9 --------- include/configs/canmb.h | 3 --- include/configs/cm5200.h | 3 --- include/configs/cmi_mpc5xx.h | 9 --------- include/configs/cogent_mpc8260.h | 9 --------- include/configs/cogent_mpc8xx.h | 9 --------- include/configs/corenet_ds.h | 8 -------- include/configs/cpci5200.h | 3 --- include/configs/csb272.h | 9 --------- include/configs/csb472.h | 9 --------- include/configs/debris.h | 10 ---------- include/configs/digsy_mtc.h | 3 --- include/configs/eXalion.h | 10 ---------- include/configs/ep8248.h | 3 --- include/configs/ep8260.h | 8 -------- include/configs/ep82xxm.h | 3 --- include/configs/galaxy5200.h | 2 -- include/configs/gw8260.h | 9 --------- include/configs/hermes.h | 9 --------- include/configs/hmi1001.h | 3 --- include/configs/hymod.h | 8 -------- include/configs/inka4x0.h | 3 --- include/configs/ipek01.h | 3 --- include/configs/jupiter.h | 3 --- include/configs/km8xx.h | 8 -------- include/configs/kmeter1.h | 8 -------- include/configs/korat.h | 8 -------- include/configs/kvme080.h | 3 --- include/configs/linkstation.h | 8 -------- include/configs/lwmon.h | 8 -------- include/configs/lwmon5.h | 8 -------- include/configs/manroland/common.h | 3 --- include/configs/mcc200.h | 3 --- include/configs/mecp5123.h | 8 -------- include/configs/mecp5200.h | 3 --- include/configs/mgcoge.h | 3 --- include/configs/motionpro.h | 3 --- include/configs/mpc5121ads.h | 8 -------- include/configs/mpc7448hpc2.h | 8 -------- include/configs/muas3001.h | 3 --- include/configs/munices.h | 2 -- include/configs/o2dnt.h | 3 --- include/configs/p3mx.h | 8 -------- include/configs/p3p440.h | 8 -------- include/configs/pcm030.h | 2 -- include/configs/pcs440ep.h | 8 -------- include/configs/pcu_e.h | 8 -------- include/configs/pdm360ng.h | 8 -------- include/configs/pf5200.h | 3 --- include/configs/ppmc7xx.h | 12 ------------ include/configs/ppmc8260.h | 9 --------- include/configs/quantum.h | 8 -------- include/configs/rmu.h | 8 -------- include/configs/rsdproto.h | 8 -------- include/configs/sacsng.h | 8 -------- include/configs/sbc405.h | 8 -------- include/configs/sbc8240.h | 8 -------- include/configs/sbc8260.h | 9 --------- include/configs/sbc8349.h | 8 -------- include/configs/sbc8548.h | 8 -------- include/configs/sbc8560.h | 8 -------- include/configs/sbc8641d.h | 8 -------- include/configs/sc3.h | 8 -------- include/configs/smmaco4.h | 3 --- include/configs/socrates.h | 8 -------- include/configs/sorcery.h | 3 --- include/configs/spc1920.h | 8 -------- include/configs/spieval.h | 3 --- include/configs/stxgp3.h | 8 -------- include/configs/stxssa.h | 8 -------- include/configs/stxxtc.h | 8 -------- include/configs/svm_sc8xx.h | 9 --------- include/configs/uc100.h | 8 -------- include/configs/utx8245.h | 9 --------- include/configs/v37.h | 8 -------- include/configs/v38b.h | 3 --- include/configs/ve8313.h | 8 -------- include/configs/virtlab2.h | 9 --------- include/configs/vme8349.h | 8 -------- include/configs/zeus.h | 8 -------- 289 files changed, 11 insertions(+), 2103 deletions(-)
diff --git a/arch/powerpc/cpu/74xx_7xx/start.S b/arch/powerpc/cpu/74xx_7xx/start.S index 47694aa..e10c44c 100644 --- a/arch/powerpc/cpu/74xx_7xx/start.S +++ b/arch/powerpc/cpu/74xx_7xx/start.S @@ -42,6 +42,7 @@
#include <asm/cache.h> #include <asm/mmu.h> +#include <asm/u-boot.h>
#if !defined(CONFIG_DB64360) && \ !defined(CONFIG_DB64460) && \ diff --git a/arch/powerpc/cpu/mpc512x/start.S b/arch/powerpc/cpu/mpc512x/start.S index 1047c51..d52cc4d 100644 --- a/arch/powerpc/cpu/mpc512x/start.S +++ b/arch/powerpc/cpu/mpc512x/start.S @@ -43,6 +43,7 @@
#include <asm/cache.h> #include <asm/mmu.h> +#include <asm/u-boot.h>
#ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "MPC512X" diff --git a/arch/powerpc/cpu/mpc5xx/start.S b/arch/powerpc/cpu/mpc5xx/start.S index 4fd9b63..26b9eac 100644 --- a/arch/powerpc/cpu/mpc5xx/start.S +++ b/arch/powerpc/cpu/mpc5xx/start.S @@ -43,6 +43,7 @@
#include <linux/config.h> #include <asm/processor.h> +#include <asm/u-boot.h>
#ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" diff --git a/arch/powerpc/cpu/mpc5xxx/start.S b/arch/powerpc/cpu/mpc5xxx/start.S index 1385869..8b683b1 100644 --- a/arch/powerpc/cpu/mpc5xxx/start.S +++ b/arch/powerpc/cpu/mpc5xxx/start.S @@ -38,6 +38,7 @@
#include <asm/cache.h> #include <asm/mmu.h> +#include <asm/u-boot.h>
#ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" diff --git a/arch/powerpc/cpu/mpc8220/start.S b/arch/powerpc/cpu/mpc8220/start.S index c156e25..320ad4e 100644 --- a/arch/powerpc/cpu/mpc8220/start.S +++ b/arch/powerpc/cpu/mpc8220/start.S @@ -37,6 +37,7 @@
#include <asm/cache.h> #include <asm/mmu.h> +#include <asm/u-boot.h>
#ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" diff --git a/arch/powerpc/cpu/mpc824x/start.S b/arch/powerpc/cpu/mpc824x/start.S index 5b126bb..3c44c00 100644 --- a/arch/powerpc/cpu/mpc824x/start.S +++ b/arch/powerpc/cpu/mpc824x/start.S @@ -49,6 +49,7 @@
#include <asm/cache.h> #include <asm/mmu.h> +#include <asm/u-boot.h>
#ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" diff --git a/arch/powerpc/cpu/mpc8260/start.S b/arch/powerpc/cpu/mpc8260/start.S index 9485afa..48105e7 100644 --- a/arch/powerpc/cpu/mpc8260/start.S +++ b/arch/powerpc/cpu/mpc8260/start.S @@ -38,6 +38,7 @@
#include <asm/cache.h> #include <asm/mmu.h> +#include <asm/u-boot.h>
#ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S index bdce915..450cfb5 100644 --- a/arch/powerpc/cpu/mpc83xx/start.S +++ b/arch/powerpc/cpu/mpc83xx/start.S @@ -40,6 +40,7 @@
#include <asm/cache.h> #include <asm/mmu.h> +#include <asm/u-boot.h>
#ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "MPC83XX" diff --git a/arch/powerpc/cpu/mpc86xx/start.S b/arch/powerpc/cpu/mpc86xx/start.S index 596053f..6127e01 100644 --- a/arch/powerpc/cpu/mpc86xx/start.S +++ b/arch/powerpc/cpu/mpc86xx/start.S @@ -40,6 +40,7 @@
#include <asm/cache.h> #include <asm/mmu.h> +#include <asm/u-boot.h>
#ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" diff --git a/arch/powerpc/cpu/mpc8xx/start.S b/arch/powerpc/cpu/mpc8xx/start.S index d6100ec..6073dab 100644 --- a/arch/powerpc/cpu/mpc8xx/start.S +++ b/arch/powerpc/cpu/mpc8xx/start.S @@ -50,6 +50,7 @@
#include <asm/cache.h> #include <asm/mmu.h> +#include <asm/u-boot.h>
#ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" diff --git a/arch/powerpc/include/asm/u-boot.h b/arch/powerpc/include/asm/u-boot.h index ea2d22d..b377705 100644 --- a/arch/powerpc/include/asm/u-boot.h +++ b/arch/powerpc/include/asm/u-boot.h @@ -62,7 +62,7 @@ typedef struct bd_info { unsigned long bi_flbfreq; /* Flexbus Freq, in MHz */ unsigned long bi_vcofreq; /* VCO Freq, in MHz */ #endif - unsigned long bi_bootflags; /* boot / reboot flag (for LynxOS) */ + unsigned long bi_bootflags; /* boot / reboot flag (Unused) */ unsigned long bi_ip_addr; /* IP Address */ unsigned char bi_enetaddr[6]; /* OLD: see README.enetaddr */ unsigned short bi_ethspeed; /* Ethernet speed in Mbps */ diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index a6dd1b4..f0b34da 100644 --- a/arch/powerpc/lib/board.c +++ b/arch/powerpc/lib/board.c @@ -546,8 +546,6 @@ void board_init_f (ulong bootflag) } #endif
- bd->bi_bootflags = bootflag; /* boot / reboot flag (for LynxOS) */ - WATCHDOG_RESET (); bd->bi_intfreq = gd->cpu_clk; /* Internal Freq, in Hz */ bd->bi_busfreq = gd->bus_clk; /* Bus Freq, in Hz */ diff --git a/board/fads/fads.h b/board/fads/fads.h index 4ab4b26..2b59d5f 100644 --- a/board/fads/fads.h +++ b/board/fads/fads.h @@ -351,14 +351,6 @@ #define CONFIG_SYS_OR1_PRELIM 0xFFFF8110 /* 64Kbyte address space */ #define CONFIG_SYS_BR1_PRELIM ((BCSR_ADDR) | BR_V)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* values according to the manual */
#define BCSR0 ((uint) (BCSR_ADDR + 0x00)) diff --git a/include/configs/A3000.h b/include/configs/A3000.h index 6d8870c..4657835 100644 --- a/include/configs/A3000.h +++ b/include/configs/A3000.h @@ -310,12 +310,4 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/ADCIOP.h b/include/configs/ADCIOP.h index d8303f3..e8f3fc8 100644 --- a/include/configs/ADCIOP.h +++ b/include/configs/ADCIOP.h @@ -200,13 +200,4 @@ #define FLASH_BASE0_PRELIM 0xFFC00000 /* FLASH bank #0 */ #define FLASH_BASE1_PRELIM 0xFFE00000 /* FLASH bank #1 */
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/AMX860.h b/include/configs/AMX860.h index 6e2907e..10131b7 100644 --- a/include/configs/AMX860.h +++ b/include/configs/AMX860.h @@ -297,12 +297,4 @@ #define CONFIG_SYS_OR6_PRELIM 0xFFFF8000 /* 32kB, 15 waits, cs after addr, no bursts */ #define CONFIG_SYS_BR6_PRELIM 0x60000401 /* use GPCM for CS generation, 8 bit port */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h index ae0a873..15dee48 100644 --- a/include/configs/AP1000.h +++ b/include/configs/AP1000.h @@ -219,14 +219,6 @@ */ #define SPD_EEPROM_ADDRESS 0x50
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/APC405.h b/include/configs/APC405.h index a7724ad..5cf99a7 100644 --- a/include/configs/APC405.h +++ b/include/configs/APC405.h @@ -429,14 +429,6 @@ extern int flash_banks; #endif
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * PCI OHCI controller */ #define CONFIG_USB_OHCI_NEW 1 diff --git a/include/configs/AR405.h b/include/configs/AR405.h index 45c64c2..9776410 100644 --- a/include/configs/AR405.h +++ b/include/configs/AR405.h @@ -263,12 +263,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/ASH405.h b/include/configs/ASH405.h index 4cb8052..49e4a77 100644 --- a/include/configs/ASH405.h +++ b/include/configs/ASH405.h @@ -346,14 +346,6 @@ #define CONFIG_SYS_DUART_RST (0x80000000 >> 14)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Default speed selection (cpu_plb_opb_ebc) in mhz. * This value will be set if iic boot eprom is disabled. */ diff --git a/include/configs/ATUM8548.h b/include/configs/ATUM8548.h index c133033..3e5399b 100644 --- a/include/configs/ATUM8548.h +++ b/include/configs/ATUM8548.h @@ -379,14 +379,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/Adder.h b/include/configs/Adder.h index e4d30a1..2b3aa15 100644 --- a/include/configs/Adder.h +++ b/include/configs/Adder.h @@ -207,14 +207,6 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16 /* For all MPC8xx chips */
-/*----------------------------------------------------------------------- - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from flash */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* pass open firmware flat tree */ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h index 576aa74..253539c 100644 --- a/include/configs/Alaska8220.h +++ b/include/configs/Alaska8220.h @@ -38,9 +38,6 @@ #define CONFIG_SYS_MPC8220_CLKIN 30000000/* ... running at 30MHz */ #define CONFIG_SYS_MPC8220_SYSPLL_VCO_MULTIPLIER 16 /* VCO multiplier can't be read from any register */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* * Serial console configuration */ diff --git a/include/configs/BAB7xx.h b/include/configs/BAB7xx.h index 4d83786..9cc5e33 100644 --- a/include/configs/BAB7xx.h +++ b/include/configs/BAB7xx.h @@ -465,15 +465,6 @@ extern unsigned long bab7xx_get_gclk_freq (void);
#define CONFIG_SYS_L2_BAB7xx
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - #define CONFIG_NET_MULTI /* Multi ethernet cards support */ #define CONFIG_TULIP #define CONFIG_TULIP_SELECT_MEDIA diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h index 44befe9..2c6ee8f 100644 --- a/include/configs/BC3450.h +++ b/include/configs/BC3450.h @@ -58,9 +58,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/BMW.h b/include/configs/BMW.h index 98f6396..53a38fb 100644 --- a/include/configs/BMW.h +++ b/include/configs/BMW.h @@ -300,13 +300,4 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - #endif /* __CONFIG_H */ diff --git a/include/configs/CANBT.h b/include/configs/CANBT.h index 115a6f9..cf34b43 100644 --- a/include/configs/CANBT.h +++ b/include/configs/CANBT.h @@ -220,13 +220,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h index 229a513..2409ad3 100644 --- a/include/configs/CATcenter.h +++ b/include/configs/CATcenter.h @@ -544,15 +544,6 @@ #define CONFIG_SYS_GPIO0_TSRL 0x00000000 #define CONFIG_SYS_GPIO0_TCR 0xF7FF8014
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - #define CONFIG_NO_SERIAL_EEPROM
/*--------------------------------------------------------------------*/ diff --git a/include/configs/CCM.h b/include/configs/CCM.h index 3f4a2c1..e00313b 100644 --- a/include/configs/CCM.h +++ b/include/configs/CCM.h @@ -476,13 +476,4 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/CMS700.h b/include/configs/CMS700.h index 2b6786b..60b1d98 100644 --- a/include/configs/CMS700.h +++ b/include/configs/CMS700.h @@ -313,14 +313,6 @@ #define CONFIG_SYS_PLD_RESET (0x80000000 >> 12) /* GPIO12 */
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Default speed selection (cpu_plb_opb_ebc) in mhz. * This value will be set if iic boot eprom is disabled. */ diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h index 668cfa2..734dc2f 100644 --- a/include/configs/CPC45.h +++ b/include/configs/CPC45.h @@ -338,16 +338,6 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - - /*----------------------------------------------------------------------*/ /* CPC45 Memory Map */ /*----------------------------------------------------------------------*/ diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index 9221211..225cac2 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -265,12 +265,4 @@ #define CONFIG_SYS_PB_LED (0x80000000 >> 16) /* GPIO16 */ #define CONFIG_SYS_INTA_FAKE (0x80000000 >> 23) /* GPIO23 */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h index 3e7020d..55ccdc2 100644 --- a/include/configs/CPCI405.h +++ b/include/configs/CPCI405.h @@ -332,13 +332,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index d3000f6..5668655 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -393,13 +393,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/CPCI405AB.h b/include/configs/CPCI405AB.h index d376344..c1e79f8 100644 --- a/include/configs/CPCI405AB.h +++ b/include/configs/CPCI405AB.h @@ -385,13 +385,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h index 07acab0..3f1354f 100644 --- a/include/configs/CPCI405DT.h +++ b/include/configs/CPCI405DT.h @@ -388,12 +388,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h index f2d51f7..d4f2540 100644 --- a/include/configs/CPCI750.h +++ b/include/configs/CPCI750.h @@ -616,14 +616,6 @@
#define L2_ENABLE (L2_INIT | L2CR_L2E)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_BOARD_ASM_INIT 1
#define CPCI750_SLAVE_TEST (((in8(0xf0300000) & 0x80) == 0) ? 0 : 1) diff --git a/include/configs/CPCIISER4.h b/include/configs/CPCIISER4.h index 5b50bcf..3fd2442 100644 --- a/include/configs/CPCIISER4.h +++ b/include/configs/CPCIISER4.h @@ -246,12 +246,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/CPU86.h b/include/configs/CPU86.h index 6d76d9f..fea7ba4 100644 --- a/include/configs/CPU86.h +++ b/include/configs/CPU86.h @@ -333,15 +333,6 @@ #define CONFIG_ENV_SIZE (2048 - 512) #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*----------------------------------------------------------------------- * Cache Configuration */ diff --git a/include/configs/CPU87.h b/include/configs/CPU87.h index 83b010c..4b9b8e6 100644 --- a/include/configs/CPU87.h +++ b/include/configs/CPU87.h @@ -354,15 +354,6 @@ #define CONFIG_ENV_SIZE (2048 - 512) #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*----------------------------------------------------------------------- * Cache Configuration */ diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h index 9ab30ec..d6cce54 100644 --- a/include/configs/CRAYL1.h +++ b/include/configs/CRAYL1.h @@ -235,12 +235,4 @@ #define EEPROM_WRITE_ADDRESS 0xA0 #define EEPROM_READ_ADDRESS 0xA1
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/CU824.h b/include/configs/CU824.h index 4a3f2bc..894ecf1 100644 --- a/include/configs/CU824.h +++ b/include/configs/CU824.h @@ -290,14 +290,6 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /*----------------------------------------------------------------------- * PCI stuff *----------------------------------------------------------------------- diff --git a/include/configs/DASA_SIM.h b/include/configs/DASA_SIM.h index 21230e1..bb286eb 100644 --- a/include/configs/DASA_SIM.h +++ b/include/configs/DASA_SIM.h @@ -190,13 +190,4 @@
#define FLASH_BASE0_PRELIM 0xFFE00000 /* FLASH bank #0 */
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h index 910933a..c30537a 100644 --- a/include/configs/DB64360.h +++ b/include/configs/DB64360.h @@ -593,14 +593,6 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
#define L2_ENABLE (L2_INIT | L2CR_L2E)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_BOARD_ASM_INIT 1
#endif /* __CONFIG_H */ diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h index 765eaaf..a7d7cab 100644 --- a/include/configs/DB64460.h +++ b/include/configs/DB64460.h @@ -531,14 +531,6 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
#define L2_ENABLE (L2_INIT | L2CR_L2E)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_BOARD_ASM_INIT 1
#endif /* __CONFIG_H */ diff --git a/include/configs/DP405.h b/include/configs/DP405.h index 4423f2a..5b9db8e 100644 --- a/include/configs/DP405.h +++ b/include/configs/DP405.h @@ -252,14 +252,6 @@ #define CONFIG_SYS_GPIO0_TCR 0xB7FE0014 /* 0 ... 31 */
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Default speed selection (cpu_plb_opb_ebc) in mhz. * This value will be set if iic boot eprom is disabled. */ diff --git a/include/configs/DU405.h b/include/configs/DU405.h index 8f1fc78..5a3ebff 100644 --- a/include/configs/DU405.h +++ b/include/configs/DU405.h @@ -304,13 +304,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/DU440.h b/include/configs/DU440.h index 830466f..4f2ae49 100644 --- a/include/configs/DU440.h +++ b/include/configs/DU440.h @@ -416,14 +416,6 @@ int du440_phy_addr(int devnum); #define CONFIG_SYS_NAND_BASE_LIST {CONFIG_SYS_NAND0_ADDR + CONFIG_SYS_NAND0_CS, \ CONFIG_SYS_NAND1_ADDR + CONFIG_SYS_NAND1_CS}
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/ELPPC.h b/include/configs/ELPPC.h index 84d27b6..22f6377 100644 --- a/include/configs/ELPPC.h +++ b/include/configs/ELPPC.h @@ -347,14 +347,6 @@ #endif #define L2_ENABLE (L2_INIT | L2CR_L2E)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_NET_MULTI /* Multi ethernet cards support */ #define CONFIG_EEPRO100 #define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ diff --git a/include/configs/ELPT860.h b/include/configs/ELPT860.h index 0f56302..17fb520 100644 --- a/include/configs/ELPT860.h +++ b/include/configs/ELPT860.h @@ -386,17 +386,4 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
-/*----------------------------------------------------------------------- - * Internal Definitions - *----------------------------------------------------------------------- - * - */ - -/* - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - #endif /* __CONFIG_H */ diff --git a/include/configs/EP88x.h b/include/configs/EP88x.h index e1c6096..9a07b98 100644 --- a/include/configs/EP88x.h +++ b/include/configs/EP88x.h @@ -205,12 +205,4 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16 /* For all MPC8xx chips */
-/*----------------------------------------------------------------------- - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from flash */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/ERIC.h b/include/configs/ERIC.h index e07f9a1..10bbda5 100644 --- a/include/configs/ERIC.h +++ b/include/configs/ERIC.h @@ -355,14 +355,6 @@ */ #define SPD_EEPROM_ADDRESS 0x50
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/ESTEEM192E.h b/include/configs/ESTEEM192E.h index 11a862e..eee9480 100644 --- a/include/configs/ESTEEM192E.h +++ b/include/configs/ESTEEM192E.h @@ -310,22 +310,4 @@ #define CONFIG_SYS_MAMR_8COL 0x18803112 #define CONFIG_SYS_MAMR_9COL 0x18803112 /* same as 8 column because its just easier to port with*/
- -/* - * Internal Definitions - * - * Boot Flags - */ - -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/ETX094.h b/include/configs/ETX094.h index c36f2bb..a490ed7 100644 --- a/include/configs/ETX094.h +++ b/include/configs/ETX094.h @@ -355,13 +355,4 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_1X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/EVB64260.h b/include/configs/EVB64260.h index 0903536..5b592f1 100644 --- a/include/configs/EVB64260.h +++ b/include/configs/EVB64260.h @@ -419,14 +419,6 @@
#define L2_ENABLE (L2_INIT | L2CR_L2E)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_BOARD_ASM_INIT 1
diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h index 4d08243..9c6d99b 100644 --- a/include/configs/EXBITGEN.h +++ b/include/configs/EXBITGEN.h @@ -205,14 +205,6 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/FADS823.h b/include/configs/FADS823.h index cb75960..03e41ab 100644 --- a/include/configs/FADS823.h +++ b/include/configs/FADS823.h @@ -340,14 +340,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
-#define CONFIG_SYS_MAMR 0x13a01114 -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */
/* values according to the manual */
diff --git a/include/configs/FADS850SAR.h b/include/configs/FADS850SAR.h index 84187fb..989066f 100644 --- a/include/configs/FADS850SAR.h +++ b/include/configs/FADS850SAR.h @@ -295,14 +295,6 @@ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
#define CONFIG_SYS_MAMR 0x13a01114 -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ -
/* values according to the manual */
diff --git a/include/configs/FLAGADM.h b/include/configs/FLAGADM.h index 0f4277c..07651e6 100644 --- a/include/configs/FLAGADM.h +++ b/include/configs/FLAGADM.h @@ -312,12 +312,4 @@ #define CONFIG_SYS_OR4 ( OR_AM_MSK | OR_CSNT_SAM | OR_BI | OR_G5LS) #define CONFIG_SYS_BR4 ( (DSP_BASE & BR_BA_MSK) | BR_PS_16 | BR_MS_UPMB | BR_V )
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h index addca2f..7c21149 100644 --- a/include/configs/FPS850L.h +++ b/include/configs/FPS850L.h @@ -428,15 +428,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* pass open firmware flat tree */ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h index ec9000d..0b7853f 100644 --- a/include/configs/FPS860L.h +++ b/include/configs/FPS860L.h @@ -428,15 +428,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SCC1_ENET
/* pass open firmware flat tree */ diff --git a/include/configs/G2000.h b/include/configs/G2000.h index d2883eb..9b2bd9c 100644 --- a/include/configs/G2000.h +++ b/include/configs/G2000.h @@ -376,14 +376,6 @@ #define CONFIG_SYS_GPIO0_TCR 0xF7FF8014
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Default speed selection (cpu_plb_opb_ebc) in mhz. * This value will be set if iic boot eprom is disabled. */ diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h index 12f879a..a44ae66 100644 --- a/include/configs/GEN860T.h +++ b/include/configs/GEN860T.h @@ -725,12 +725,6 @@ )
/* - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * FEC interrupt assignment */ #define FEC_INTERRUPT SIU_LEVEL1 diff --git a/include/configs/GENIETV.h b/include/configs/GENIETV.h index fadd830..e2207ac 100644 --- a/include/configs/GENIETV.h +++ b/include/configs/GENIETV.h @@ -331,14 +331,6 @@ MAMR_G0CLA_A11 | MAMR_RLFA_1X | MAMR_WLFA_1X \ | MAMR_TLFA_4X) /* 0x5d802114 */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* values according to the manual */
#define CONFIG_DRAM_50MHZ 1 diff --git a/include/configs/HH405.h b/include/configs/HH405.h index 01e0bc6..15203e4 100644 --- a/include/configs/HH405.h +++ b/include/configs/HH405.h @@ -476,14 +476,6 @@ #define CONFIG_SYS_LCD1_RST (0x80000000 >> 31)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Default speed selection (cpu_plb_opb_ebc) in mhz. * This value will be set if iic boot eprom is disabled. */ diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h index 251fe67..d03cf9b 100644 --- a/include/configs/HIDDEN_DRAGON.h +++ b/include/configs/HIDDEN_DRAGON.h @@ -376,14 +376,6 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* values according to the manual */ #define CONFIG_DRAM_50MHZ 1 #define CONFIG_SDRAM_50MHZ diff --git a/include/configs/HMI10.h b/include/configs/HMI10.h index 2747d8c..b65c23c 100644 --- a/include/configs/HMI10.h +++ b/include/configs/HMI10.h @@ -487,15 +487,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* pass open firmware flat tree */ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 diff --git a/include/configs/HUB405.h b/include/configs/HUB405.h index 8c6d5ed..4e47c48 100644 --- a/include/configs/HUB405.h +++ b/include/configs/HUB405.h @@ -349,14 +349,6 @@ #define CONFIG_SYS_UART5_RS232 (0x80000000 >> 8)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Default speed selection (cpu_plb_opb_ebc) in mhz. * This value will be set if iic boot eprom is disabled. */ diff --git a/include/configs/IAD210.h b/include/configs/IAD210.h index ea1e706..a2743f2 100644 --- a/include/configs/IAD210.h +++ b/include/configs/IAD210.h @@ -370,15 +370,6 @@ MAMR_AMA_TYPE_0 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A11 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_8X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #ifdef CONFIG_MPC860T
/* Interrupt level assignments. diff --git a/include/configs/ICU862.h b/include/configs/ICU862.h index 917135e..4a2e776 100644 --- a/include/configs/ICU862.h +++ b/include/configs/ICU862.h @@ -447,15 +447,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
-#define CONFIG_SYS_MAMR 0x13a01114 -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #ifdef CONFIG_MPC860T
/* Interrupt level assignments. diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h index 71bb7b4..55a3ca7 100644 --- a/include/configs/IDS8247.h +++ b/include/configs/IDS8247.h @@ -310,15 +310,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc()*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*----------------------------------------------------------------------- * Cache Configuration */ diff --git a/include/configs/IP860.h b/include/configs/IP860.h index ed6b7fd..31e0cd1 100644 --- a/include/configs/IP860.h +++ b/include/configs/IP860.h @@ -455,18 +455,4 @@ typedef struct ip860_bcsr_s { #define BD_CTRL_FLWE 0x20 /* Flash Write Enable */ #define BD_CTRL_RWDN 0x10 /* VMEBus Requester Release When Done Enable */
-/*----------------------------------------------------------------------- - * - *----------------------------------------------------------------------- - * - */ - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/IPHASE4539.h b/include/configs/IPHASE4539.h index 3cb6cf7..cbc25e6 100644 --- a/include/configs/IPHASE4539.h +++ b/include/configs/IPHASE4539.h @@ -250,15 +250,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
/*----------------------------------------------------------------------- - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - -/*----------------------------------------------------------------------- * Cache Configuration */ #define CONFIG_SYS_CACHELINE_SIZE 32 /* For MPC8260 CPU */ diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h index c0b1d86..b25a8d9 100644 --- a/include/configs/ISPAN.h +++ b/include/configs/ISPAN.h @@ -235,14 +235,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
/*----------------------------------------------------------------------- - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from flash */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/*----------------------------------------------------------------------- * Cache Configuration */ #define CONFIG_SYS_CACHELINE_SIZE 32 /* For MPC8260 CPU */ diff --git a/include/configs/IVML24.h b/include/configs/IVML24.h index 1a4924e..f50fd9c 100644 --- a/include/configs/IVML24.h +++ b/include/configs/IVML24.h @@ -473,13 +473,4 @@ MBMR_AMB_TYPE_1 | MBMR_DSB_1_CYCL | MBMR_G0CLB_A10 | \ MBMR_RLFB_1X | MBMR_WLFB_1X | MBMR_TLFB_4X) #endif - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/IVMS8.h b/include/configs/IVMS8.h index 256cabd..b5774d6 100644 --- a/include/configs/IVMS8.h +++ b/include/configs/IVMS8.h @@ -456,13 +456,4 @@ MBMR_RLFB_1X | MBMR_WLFB_1X | MBMR_TLFB_4X)
#endif - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h index 3961100..4923cc6 100644 --- a/include/configs/IceCube.h +++ b/include/configs/IceCube.h @@ -35,9 +35,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/JSE.h b/include/configs/JSE.h index 98f5661..5a528d3 100644 --- a/include/configs/JSE.h +++ b/include/configs/JSE.h @@ -295,15 +295,6 @@ /* Configuration Port location */ #define CONFIG_PORT_ADDR 0xF0000500
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h index 49a7378..a9ebc08 100644 --- a/include/configs/KAREF.h +++ b/include/configs/KAREF.h @@ -284,14 +284,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal PowerOn: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* kgdb serial port baud */ #define CONFIG_KGDB_SER_INDEX 2 /* kgdb serial port */ diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h index c6978c3..e5133ef 100644 --- a/include/configs/KUP4K.h +++ b/include/configs/KUP4K.h @@ -495,15 +495,6 @@
#define LATCH_ADDR 0x90000200
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - #define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */ #define CONFIG_AUTOBOOT_STOP_STR "." #define CONFIG_SILENT_CONSOLE 1 diff --git a/include/configs/KUP4X.h b/include/configs/KUP4X.h index ab535e1..11bd245 100644 --- a/include/configs/KUP4X.h +++ b/include/configs/KUP4X.h @@ -446,15 +446,6 @@
#define LATCH_ADDR 0x90000200
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - #define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */
#define CONFIG_AUTOBOOT_STOP_STR "." /* easy to stop for now */ diff --git a/include/configs/LANTEC.h b/include/configs/LANTEC.h index 6e8a4b8..0a06aa1 100644 --- a/include/configs/LANTEC.h +++ b/include/configs/LANTEC.h @@ -340,14 +340,6 @@ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * JFFS2 partitions * */ diff --git a/include/configs/MBX.h b/include/configs/MBX.h index 5f7c7a8..32a953e 100644 --- a/include/configs/MBX.h +++ b/include/configs/MBX.h @@ -310,12 +310,4 @@ */ #define CONFIG_SYS_DER 0
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/MBX860T.h b/include/configs/MBX860T.h index afe2383..6a9991c 100644 --- a/include/configs/MBX860T.h +++ b/include/configs/MBX860T.h @@ -282,14 +282,6 @@ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
#define CONFIG_SYS_MAMR 0x13821000 -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ -
/* values according to the manual */
diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h index e7429dd..00951c5 100644 --- a/include/configs/METROBOX.h +++ b/include/configs/METROBOX.h @@ -349,14 +349,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal PowerOn: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* kgdb serial port baud */ #define CONFIG_KGDB_SER_INDEX 2 /* kgdb serial port */ diff --git a/include/configs/MHPC.h b/include/configs/MHPC.h index 19a288c..96785e1 100644 --- a/include/configs/MHPC.h +++ b/include/configs/MHPC.h @@ -386,12 +386,4 @@ */ #define CONFIG_SYS_DER 0
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 7e6484e..c05de54 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -313,15 +313,6 @@ #define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 12) #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*********************************************************************** * External peripheral base address ***********************************************************************/ diff --git a/include/configs/ML2.h b/include/configs/ML2.h index 5fcc173..28b06ef 100644 --- a/include/configs/ML2.h +++ b/include/configs/ML2.h @@ -231,14 +231,6 @@ */ #define SPD_EEPROM_ADDRESS 0x50
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MOUSSE.h b/include/configs/MOUSSE.h index 986590a..17dc493 100644 --- a/include/configs/MOUSSE.h +++ b/include/configs/MOUSSE.h @@ -312,15 +312,6 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* Localizations */ #if 0 #define CONFIG_ETHADDR 0:0:0:0:1:d diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h index ffd37fd..9c7466a 100644 --- a/include/configs/MPC8260ADS.h +++ b/include/configs/MPC8260ADS.h @@ -373,9 +373,6 @@ #define CONFIG_SYS_HRCW_SLAVE6 0 #define CONFIG_SYS_HRCW_SLAVE7 0
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_MONITOR_BASE TEXT_BASE #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) # define CONFIG_SYS_RAMBOOT diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h index 55d77f8..dd7ca12 100644 --- a/include/configs/MPC8266ADS.h +++ b/include/configs/MPC8266ADS.h @@ -419,9 +419,6 @@ #define CONFIG_SYS_HRCW_SLAVE6 0 #define CONFIG_SYS_HRCW_SLAVE7 0
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_MONITOR_BASE TEXT_BASE #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) # define CONFIG_SYS_RAMBOOT diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 6cd5da7..84ad7d9 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -491,14 +491,6 @@ #define CONFIG_SYS_DBAT3U CONFIG_SYS_IBAT3U
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Environment Configuration */
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 524afa5..86f39bd 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -570,14 +570,6 @@ #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Environment Configuration */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index f1b110b..51f8efd 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -598,14 +598,6 @@ #define CONFIG_SYS_DBAT7L CONFIG_SYS_IBAT7L #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 9a296a1..4084e3b 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -508,14 +508,6 @@ #define CONFIG_SYS_DBAT7L CONFIG_SYS_IBAT7L #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if (CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index 68ff191..4391c8d 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -527,14 +527,6 @@ #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 73dbea4..5689c4f 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -668,14 +668,6 @@ #define CONFIG_SYS_DBAT7L CONFIG_SYS_IBAT7L #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 9be571f..aa4aa45 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -661,14 +661,6 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CONFIG_SYS_DBAT7L CONFIG_SYS_IBAT7L #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h index c58e003..0a0bd1f 100644 --- a/include/configs/MPC8360EMDS.h +++ b/include/configs/MPC8360EMDS.h @@ -568,14 +568,6 @@ #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h index 9fa577d..82edb26 100644 --- a/include/configs/MPC8360ERDK.h +++ b/include/configs/MPC8360ERDK.h @@ -485,14 +485,6 @@ #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U #endif /* CONFIG_PCI */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 9092755..fb1eefb 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -619,14 +619,6 @@ extern int board_pci_host_broken(void); #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 79dadc4..39f9af6 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -628,14 +628,6 @@ #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 2a3c058..e2891ed 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -708,14 +708,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 577c276..994d566 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -421,14 +421,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8540EVAL.h b/include/configs/MPC8540EVAL.h index 7daf934..60ed720 100644 --- a/include/configs/MPC8540EVAL.h +++ b/include/configs/MPC8540EVAL.h @@ -331,14 +331,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 8797b30..4e67923 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -437,14 +437,6 @@ extern unsigned long get_clock_freq(void); */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index d1ac32f..53cb6b2 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -452,14 +452,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 33f49f5..a61343a 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -492,14 +492,6 @@ extern unsigned long get_clock_freq(void); */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index 0f71f11..dfc26df 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -435,14 +435,6 @@ extern unsigned long get_clock_freq(void); */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 31740fd..12b2f12 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -461,14 +461,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 2dc2932..4c80af4 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -452,14 +452,6 @@ extern unsigned long get_clock_freq(void); */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index 8177db3..b3c7a34 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -585,14 +585,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 081661e..05d04d3 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -602,14 +602,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 4d9606e..a004f30 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -517,14 +517,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 974cb6b..78ed47e 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -675,14 +675,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MUSENKI.h b/include/configs/MUSENKI.h index ec9e1ec..b8b89d7 100644 --- a/include/configs/MUSENKI.h +++ b/include/configs/MUSENKI.h @@ -293,12 +293,4 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h index 8f6b16b..b8d3993 100644 --- a/include/configs/MVBC_P.h +++ b/include/configs/MVBC_P.h @@ -34,9 +34,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000
-#define BOOTFLAG_COLD 0x01 -#define BOOTFLAG_WARM 0x02 - #define CONFIG_MISC_INIT_R 1
#define CONFIG_SYS_CACHELINE_SIZE 32 diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h index c28eb64..303c112 100644 --- a/include/configs/MVBLM7.h +++ b/include/configs/MVBLM7.h @@ -380,15 +380,6 @@ #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - -/* * Environment Configuration */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/MVBLUE.h b/include/configs/MVBLUE.h index 669816c..e9ac4a0 100644 --- a/include/configs/MVBLUE.h +++ b/include/configs/MVBLUE.h @@ -340,13 +340,4 @@ #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/MVS1.h b/include/configs/MVS1.h index 10210f0..9bf7fcb 100644 --- a/include/configs/MVS1.h +++ b/include/configs/MVS1.h @@ -406,13 +406,4 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A7 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/MVSMR.h b/include/configs/MVSMR.h index 000c4c6..43aed86 100644 --- a/include/configs/MVSMR.h +++ b/include/configs/MVSMR.h @@ -34,9 +34,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000
-#define BOOTFLAG_COLD 0x01 -#define BOOTFLAG_WARM 0x02 - #define CONFIG_MISC_INIT_R 1
#define CONFIG_SYS_CACHELINE_SIZE 32 diff --git a/include/configs/NC650.h b/include/configs/NC650.h index 6343cfe..c82dfe6 100644 --- a/include/configs/NC650.h +++ b/include/configs/NC650.h @@ -424,14 +424,6 @@
#define CONFIG_SYS_MBMR_NAND ( MBMR_WLFB_5X )
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_JFFS2_NAND 1 /* jffs2 on nand support */ #define NAND_CACHE_PAGES 16 /* size of nand cache in 512 bytes pages */
diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h index 76ca916..d618312 100644 --- a/include/configs/NETPHONE.h +++ b/include/configs/NETPHONE.h @@ -478,14 +478,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_LAST_STAGE_INIT /* needed to reset the damn phys */
/****************************************************************/ diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h index 4f9f9fe..dc16fda 100644 --- a/include/configs/NETTA.h +++ b/include/configs/NETTA.h @@ -487,14 +487,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_LAST_STAGE_INIT /* needed to reset the damn phys */
/*********************************************************************************************************** diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h index d060cb7..eadde26 100644 --- a/include/configs/NETTA2.h +++ b/include/configs/NETTA2.h @@ -479,14 +479,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_LAST_STAGE_INIT /* needed to reset the damn phys */
/****************************************************************/ diff --git a/include/configs/NETVIA.h b/include/configs/NETVIA.h index a18b480..49a0309 100644 --- a/include/configs/NETVIA.h +++ b/include/configs/NETVIA.h @@ -346,14 +346,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* Ethernet at SCC2 */ #define CONFIG_SCC2_ENET
diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h index 6a4c47d..391cf81 100644 --- a/include/configs/NSCU.h +++ b/include/configs/NSCU.h @@ -474,15 +474,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #undef CONFIG_SCC1_ENET #define CONFIG_FEC_ENET
diff --git a/include/configs/NX823.h b/include/configs/NX823.h index 5054d5e..6683ac8 100644 --- a/include/configs/NX823.h +++ b/include/configs/NX823.h @@ -356,15 +356,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_ENV_OVERWRITE /* allow changes to ethaddr (for now) */ #define CONFIG_ETHADDR 00:10:20:30:40:50 #define CONFIG_IPADDR 10.77.77.20 diff --git a/include/configs/OCRTC.h b/include/configs/OCRTC.h index 55471af..bb54e5e 100644 --- a/include/configs/OCRTC.h +++ b/include/configs/OCRTC.h @@ -294,13 +294,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/ORSG.h b/include/configs/ORSG.h index 1424713..c7d627a 100644 --- a/include/configs/ORSG.h +++ b/include/configs/ORSG.h @@ -292,13 +292,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/OXC.h b/include/configs/OXC.h index 74c51f4..36ccde0 100644 --- a/include/configs/OXC.h +++ b/include/configs/OXC.h @@ -314,13 +314,4 @@ #if defined(CONFIG_CMD_KGDB) # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index dcaca2b..5907f51 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -387,14 +387,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #ifdef CONFIG_CMD_KGDB #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h index 7e901e1..33afeae 100644 --- a/include/configs/P1_P2_RDB.h +++ b/include/configs/P1_P2_RDB.h @@ -539,14 +539,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20)/* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h index 79ce2c0..af07647 100644 --- a/include/configs/P2020DS.h +++ b/include/configs/P2020DS.h @@ -606,14 +606,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/P3G4.h b/include/configs/P3G4.h index 890170d..0508e62 100644 --- a/include/configs/P3G4.h +++ b/include/configs/P3G4.h @@ -421,14 +421,6 @@
#define L2_ENABLE (L2_INIT | L2CR_L2E)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_BOARD_ASM_INIT 1
diff --git a/include/configs/PATI.h b/include/configs/PATI.h index 88e9528..12483a0 100644 --- a/include/configs/PATI.h +++ b/include/configs/PATI.h @@ -283,16 +283,6 @@ */ #define CONFIG_SYS_DER 0x00000000
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - #define VERSION_TAG "released" #define CONFIG_ISO_STRING "MEV-10084-001"
diff --git a/include/configs/PCI405.h b/include/configs/PCI405.h index 0d443ea..348654f 100644 --- a/include/configs/PCI405.h +++ b/include/configs/PCI405.h @@ -305,12 +305,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/PCIPPC2.h b/include/configs/PCIPPC2.h index c30ac78..05d152d 100644 --- a/include/configs/PCIPPC2.h +++ b/include/configs/PCIPPC2.h @@ -238,14 +238,6 @@ L2CR_L2OH_5 | L2CR_L2CTL | L2CR_L2WT) #define L2_ENABLE (L2_INIT | L2CR_L2E)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /*----------------------------------------------------------------------- RTC m48t59 */ diff --git a/include/configs/PCIPPC6.h b/include/configs/PCIPPC6.h index bc67480..1c28e80 100644 --- a/include/configs/PCIPPC6.h +++ b/include/configs/PCIPPC6.h @@ -240,14 +240,6 @@ L2CR_L2OH_5 | L2CR_L2CTL | L2CR_L2WT) #define L2_ENABLE (L2_INIT | L2CR_L2E)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /*----------------------------------------------------------------------- RTC m48t59 */ diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 3e57c0b..be7e19c 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -254,15 +254,6 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*********************************************************************** * External peripheral base address ***********************************************************************/ diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index f917eb5..c296ab4 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -391,14 +391,6 @@ #define CONFIG_SYS_EEPROM_WP (0x80000000 >> 0)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Default speed selection (cpu_plb_opb_ebc) in MHz. * This value will be set if iic boot eprom is disabled. */ diff --git a/include/configs/PM520.h b/include/configs/PM520.h index 22de207..ce73e40 100644 --- a/include/configs/PM520.h +++ b/include/configs/PM520.h @@ -37,9 +37,6 @@
#define CONFIG_MISC_INIT_R
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/PM826.h b/include/configs/PM826.h index 636bd26..4842416 100644 --- a/include/configs/PM826.h +++ b/include/configs/PM826.h @@ -318,15 +318,6 @@ #define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*----------------------------------------------------------------------- * Cache Configuration */ diff --git a/include/configs/PM828.h b/include/configs/PM828.h index 9d620af..d23affd 100644 --- a/include/configs/PM828.h +++ b/include/configs/PM828.h @@ -312,15 +312,6 @@ #define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*----------------------------------------------------------------------- * Cache Configuration */ diff --git a/include/configs/PM854.h b/include/configs/PM854.h index 7426bca..9f9b5df 100644 --- a/include/configs/PM854.h +++ b/include/configs/PM854.h @@ -366,14 +366,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/PM856.h b/include/configs/PM856.h index 0bd28fc..1850a57 100644 --- a/include/configs/PM856.h +++ b/include/configs/PM856.h @@ -365,14 +365,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/PMC405.h b/include/configs/PMC405.h index 00a12fb..e0e3f47 100644 --- a/include/configs/PMC405.h +++ b/include/configs/PMC405.h @@ -328,14 +328,6 @@ CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_OF_LIBFDT #define CONFIG_OF_BOARD_SETUP
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index 3c19f52..dd04ec4 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -503,14 +503,6 @@ #define CONFIG_SYS_NAND_SELECT_DEVICE 1 /* nand driver supports mutipl. chips */ #define CONFIG_SYS_NAND_QUIET_TEST 1
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/PN62.h b/include/configs/PN62.h index 562c5c3..f32322f 100644 --- a/include/configs/PN62.h +++ b/include/configs/PN62.h @@ -301,14 +301,4 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - #endif /* __CONFIG_H */ diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h index 44f03dc..777a10a 100644 --- a/include/configs/PPChameleonEVB.h +++ b/include/configs/PPChameleonEVB.h @@ -551,15 +551,6 @@ #define CONFIG_SYS_GPIO0_TSRL 0x00000000 #define CONFIG_SYS_GPIO0_TCR 0xF7FF8014
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - #define CONFIG_NO_SERIAL_EEPROM
/*--------------------------------------------------------------------*/ diff --git a/include/configs/QS823.h b/include/configs/QS823.h index c1416cb..e938e68 100644 --- a/include/configs/QS823.h +++ b/include/configs/QS823.h @@ -563,14 +563,6 @@ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X) #define CONFIG_SYS_BR7_PRELIM 0xF0700000
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Sanity checks */ #if defined(CONFIG_SCC1_ENET) && defined(CONFIG_FEC_ENET) diff --git a/include/configs/QS850.h b/include/configs/QS850.h index de74fee..0b1c299 100644 --- a/include/configs/QS850.h +++ b/include/configs/QS850.h @@ -563,14 +563,6 @@ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X) #define CONFIG_SYS_BR7_PRELIM 0xF0700000
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Sanity checks */ #if defined(CONFIG_SCC1_ENET) && defined(CONFIG_FEC_ENET) diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h index 705d375..5f2f668 100644 --- a/include/configs/QS860T.h +++ b/include/configs/QS860T.h @@ -400,15 +400,6 @@ CONFIG_SPI /* #define CONFIG_SYS_OR7 0xFF000000 */ /* #define CONFIG_SYS_BR7 0xE8000000 */
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* * Sanity checks */ diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h index 830f4bc..ddc1232 100644 --- a/include/configs/R360MPI.h +++ b/include/configs/R360MPI.h @@ -475,13 +475,4 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h index 00ac6cf..29ac234 100644 --- a/include/configs/RBC823.h +++ b/include/configs/RBC823.h @@ -406,15 +406,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* * JFFS2 partitions * diff --git a/include/configs/RPXClassic.h b/include/configs/RPXClassic.h index bec5278..06ff979 100644 --- a/include/configs/RPXClassic.h +++ b/include/configs/RPXClassic.h @@ -442,15 +442,6 @@ MAMR_AMA_TYPE_2 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A12 | \ MAMR_GPL_A4DIS | MAMR_RLFA_4X | MAMR_WLFA_3X | MAMR_TLFA_16X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ /* Configuration variable added by yooth. */ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ diff --git a/include/configs/RPXlite.h b/include/configs/RPXlite.h index dd9134d..6013378 100644 --- a/include/configs/RPXlite.h +++ b/include/configs/RPXlite.h @@ -335,15 +335,6 @@ MAMR_AMA_TYPE_2 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A12 | \ MAMR_GPL_A4DIS | MAMR_RLFA_4X | MAMR_WLFA_3X | MAMR_TLFA_16X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ /* Configuration variable added by yooth. */ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h index a59053c..dd6429c 100644 --- a/include/configs/RPXlite_DW.h +++ b/include/configs/RPXlite_DW.h @@ -414,14 +414,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10) /* CONFIG_SYS_MAMR_9COL:0x20904000 @ 64MHz */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ /* Configuration variable added by yooth. */ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ diff --git a/include/configs/RPXsuper.h b/include/configs/RPXsuper.h index da962f3..84aa7e2 100644 --- a/include/configs/RPXsuper.h +++ b/include/configs/RPXsuper.h @@ -504,12 +504,4 @@ ORxG_SCY_5_CLK |\ ORxG_TRLX)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/RRvision.h b/include/configs/RRvision.h index 6ec5be0..e75d32f 100644 --- a/include/configs/RRvision.h +++ b/include/configs/RRvision.h @@ -468,12 +468,4 @@ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h index e630afe..4d3ecf2 100644 --- a/include/configs/Rattler.h +++ b/include/configs/Rattler.h @@ -262,9 +262,6 @@ #define CONFIG_SYS_HRCW_SLAVE6 0 #define CONFIG_SYS_HRCW_SLAVE7 0
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_MALLOC_LEN (4096 << 10) /* Reserve 4 MB for malloc() */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h index 5d424dd..32110de 100644 --- a/include/configs/SBC8540.h +++ b/include/configs/SBC8540.h @@ -421,14 +421,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/SCM.h b/include/configs/SCM.h index c6fb074..48375bd 100644 --- a/include/configs/SCM.h +++ b/include/configs/SCM.h @@ -342,15 +342,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc()*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*----------------------------------------------------------------------- * Hardware Information Block */ diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h index 70b7489..efd0a89 100644 --- a/include/configs/SIMPC8313.h +++ b/include/configs/SIMPC8313.h @@ -477,14 +477,6 @@ #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Environment Configuration */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/SM850.h b/include/configs/SM850.h index 56f03e2..e8c10ec 100644 --- a/include/configs/SM850.h +++ b/include/configs/SM850.h @@ -363,15 +363,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* pass open firmware flat tree */ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 diff --git a/include/configs/SPD823TS.h b/include/configs/SPD823TS.h index fa77882..63a7137 100644 --- a/include/configs/SPD823TS.h +++ b/include/configs/SPD823TS.h @@ -417,12 +417,4 @@ MBMR_AMB_TYPE_0 | MBMR_DSB_1_CYCL | MBMR_G0CLB_A11 | \ MBMR_RLFB_1X | MBMR_WLFB_1X | MBMR_TLFB_4X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h index 8ee8cbf..7db9d1b 100644 --- a/include/configs/SXNI855T.h +++ b/include/configs/SXNI855T.h @@ -372,13 +372,6 @@ #define DUART_BR5_VALUE ((CONFIG_SYS_DUARTA_BASE & BR_BA_MSK ) | DUART_BR_VALUE) #define DUART_BR6_VALUE ((CONFIG_SYS_DUARTB_BASE & BR_BA_MSK ) | DUART_BR_VALUE)
-/********************************************************** - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_RESET_ON_PANIC /* reset if system panic() */
#define CONFIG_ENV_IS_IN_FLASH diff --git a/include/configs/Sandpoint8240.h b/include/configs/Sandpoint8240.h index 125b9a2..91b961f 100644 --- a/include/configs/Sandpoint8240.h +++ b/include/configs/Sandpoint8240.h @@ -400,16 +400,6 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /* values according to the manual */
#define CONFIG_DRAM_50MHZ 1 diff --git a/include/configs/Sandpoint8245.h b/include/configs/Sandpoint8245.h index 8cb920e..290969e 100644 --- a/include/configs/Sandpoint8245.h +++ b/include/configs/Sandpoint8245.h @@ -378,16 +378,6 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /* values according to the manual */
#define CONFIG_DRAM_50MHZ 1 diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h index 6da18eb..6afeb1f 100644 --- a/include/configs/TB5200.h +++ b/include/configs/TB5200.h @@ -39,9 +39,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h index 7cefa32..fd1fc02 100644 --- a/include/configs/TK885D.h +++ b/include/configs/TK885D.h @@ -484,14 +484,6 @@ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Network configuration */ #define CONFIG_FEC_ENET /* enable ethernet on FEC */ diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h index 50197f4..4ef5265 100644 --- a/include/configs/TOP5200.h +++ b/include/configs/TOP5200.h @@ -47,9 +47,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/TOP860.h b/include/configs/TOP860.h index b9e450d..1d73474 100644 --- a/include/configs/TOP860.h +++ b/include/configs/TOP860.h @@ -246,14 +246,6 @@ */ #define FEC_INTERRUPT SIU_LEVEL1 /* FEC interrupt */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /*----------------------------------------------------------------------- * Debug Enable Register *----------------------------------------------------------------------- diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index 107bff1..8d4eca3 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -44,9 +44,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index 372c76d..13b9f93 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -481,15 +481,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* pass open firmware flat tree */ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index 64c9707..219ad49 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -477,15 +477,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* pass open firmware flat tree */ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h index 582e670..c51fd19 100644 --- a/include/configs/TQM8260.h +++ b/include/configs/TQM8260.h @@ -379,15 +379,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (512 << 10) /* Reserve 512 kB for malloc()*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*----------------------------------------------------------------------- * Cache Configuration */ diff --git a/include/configs/TQM8272.h b/include/configs/TQM8272.h index 12a7eda..7d6fb58 100644 --- a/include/configs/TQM8272.h +++ b/include/configs/TQM8272.h @@ -502,14 +502,6 @@ #define CONFIG_SYS_MONITOR_LEN (192 << 10) /* Reserve 192 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc()*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /*----------------------------------------------------------------------- * Cache Configuration */ diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index c1e0e64..8c84ddc 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -463,14 +463,6 @@ extern int tqm834x_num_flash_banks; #define CONFIG_SYS_DBAT7L CONFIG_SYS_IBAT7L #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index bf6ecce..0050feb 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -466,15 +466,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* pass open firmware flat tree */ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index 7442452..5cc815f 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -466,15 +466,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* pass open firmware flat tree */ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index 5bf8f02..4932418 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -470,15 +470,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SCC1_ENET #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index 456ed7e..1039ceb 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -505,15 +505,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SCC1_ENET #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h index abbaf38..02b6ac3 100644 --- a/include/configs/TQM85xx.h +++ b/include/configs/TQM85xx.h @@ -624,14 +624,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port*/ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index 94b9a3b..26e61c1 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -469,15 +469,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SCC1_ENET #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index ce5e691..b7fe824 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -474,14 +474,6 @@ MAMR_AMA_TYPE_2 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A9 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SCC1_ENET #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index d77df9c..e10270b 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -474,15 +474,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_NET_MULTI #define CONFIG_SCC1_ENET #define CONFIG_FEC_ENET diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index a6c465b..49b1c83 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -475,15 +475,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_NET_MULTI #define CONFIG_SCC1_ENET #define CONFIG_FEC_ENET diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index 9ec815c..c4d0874 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -496,14 +496,6 @@ MAMR_AMA_TYPE_2 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A9 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SCC1_ENET #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h index c715c07..07a0d91 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -482,14 +482,6 @@ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Network configuration */ #define CONFIG_SCC2_ENET /* enable ethernet on SCC2 */ diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h index 7510ab1..a26fb97 100644 --- a/include/configs/Total5200.h +++ b/include/configs/Total5200.h @@ -46,9 +46,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/VOH405.h b/include/configs/VOH405.h index 9c91fcc..12f8631 100644 --- a/include/configs/VOH405.h +++ b/include/configs/VOH405.h @@ -404,14 +404,6 @@ #define CONFIG_SYS_EEPROM_WP (0x80000000 >> 0)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Default speed selection (cpu_plb_opb_ebc) in mhz. * This value will be set if iic boot eprom is disabled. */ diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index 871e4c3..b9c90d0 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -282,14 +282,6 @@ #define CONFIG_SYS_GPIO0_TCR 0xF7FE0014 /* 0 ... 31 */
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Default speed selection (cpu_plb_opb_ebc) in mhz. * This value will be set if iic boot eprom is disabled. */ diff --git a/include/configs/VoVPN-GW.h b/include/configs/VoVPN-GW.h index 3614184..e2ebe20 100644 --- a/include/configs/VoVPN-GW.h +++ b/include/configs/VoVPN-GW.h @@ -313,10 +313,6 @@ #define CONFIG_SYS_MONITOR_LEN 0x00020000 #define CONFIG_SYS_MALLOC_LEN 0x00020000
-/* boot flags */ -#define BOOTFLAG_COLD 0x01 /* normal power-on */ -#define BOOTFLAG_WARM 0x02 /* software reboot */ - /* cache configuration */ #define CONFIG_SYS_CACHELINE_SIZE 32 /* for MPC8260 */ #if defined(CONFIG_CMD_KGDB) diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h index f06bfe5..422411c 100644 --- a/include/configs/W7OLMC.h +++ b/include/configs/W7OLMC.h @@ -310,15 +310,6 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h index be8c9f8..c4c202c 100644 --- a/include/configs/W7OLMG.h +++ b/include/configs/W7OLMG.h @@ -313,15 +313,6 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/WUH405.h b/include/configs/WUH405.h index be9ac62..53ece95 100644 --- a/include/configs/WUH405.h +++ b/include/configs/WUH405.h @@ -343,14 +343,6 @@ #define CONFIG_SYS_DUART_RST (0x80000000 >> 14)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Default speed selection (cpu_plb_opb_ebc) in mhz. * This value will be set if iic boot eprom is disabled. */ diff --git a/include/configs/XPEDITE1000.h b/include/configs/XPEDITE1000.h index cf39aea..95cb5df 100644 --- a/include/configs/XPEDITE1000.h +++ b/include/configs/XPEDITE1000.h @@ -243,12 +243,6 @@ extern void out32(unsigned int, unsigned long); #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
/* - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Environment Configuration */ #define CONFIG_ENV_IS_IN_FLASH 1 diff --git a/include/configs/XPEDITE5170.h b/include/configs/XPEDITE5170.h index 8770a8d..26a66e0 100644 --- a/include/configs/XPEDITE5170.h +++ b/include/configs/XPEDITE5170.h @@ -575,12 +575,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_BOOTM_LEN (16 << 20) /* Increase max gunzip size */
/* - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Environment Configuration */ #define CONFIG_ENV_IS_IN_FLASH 1 diff --git a/include/configs/XPEDITE5200.h b/include/configs/XPEDITE5200.h index 1fbe4fb..f7345e7 100644 --- a/include/configs/XPEDITE5200.h +++ b/include/configs/XPEDITE5200.h @@ -370,12 +370,6 @@ #define CONFIG_SYS_BOOTM_LEN (16 << 20) /* Increase max gunzip size */
/* - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Environment Configuration */ #define CONFIG_ENV_IS_IN_FLASH 1 diff --git a/include/configs/XPEDITE5370.h b/include/configs/XPEDITE5370.h index 8225fff..b7fa021 100644 --- a/include/configs/XPEDITE5370.h +++ b/include/configs/XPEDITE5370.h @@ -427,12 +427,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_BOOTM_LEN (16 << 20) /* Increase max gunzip size */
/* - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Environment Configuration */ #define CONFIG_ENV_IS_IN_FLASH 1 diff --git a/include/configs/Yukon8220.h b/include/configs/Yukon8220.h index c439068..c441fa2 100644 --- a/include/configs/Yukon8220.h +++ b/include/configs/Yukon8220.h @@ -38,9 +38,6 @@ #define CONFIG_SYS_MPC8220_CLKIN 30000000/* ... running at 30MHz */ #define CONFIG_SYS_MPC8220_SYSPLL_VCO_MULTIPLIER 16 /* VCO multiplier can't be read from any register */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* * Serial console configuration */ diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h index 8ae765c..796a9bd 100644 --- a/include/configs/ZPC1900.h +++ b/include/configs/ZPC1900.h @@ -212,9 +212,6 @@ #define CONFIG_SYS_HRCW_SLAVE6 0 #define CONFIG_SYS_HRCW_SLAVE7 0
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_MONITOR_BASE TEXT_BASE #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_RAMBOOT diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h index fcc47a9..8cdf890 100644 --- a/include/configs/ZUMA.h +++ b/include/configs/ZUMA.h @@ -387,12 +387,4 @@ */ #define CONFIG_GT_I2C
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/aev.h b/include/configs/aev.h index 98958a6..0d2a7ff 100644 --- a/include/configs/aev.h +++ b/include/configs/aev.h @@ -43,9 +43,6 @@
#define CONFIG_HIGH_BATS 1 /* High BATs supported */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* * Serial console configuration */ diff --git a/include/configs/alpr.h b/include/configs/alpr.h index ee0c14d..359fd0f 100644 --- a/include/configs/alpr.h +++ b/include/configs/alpr.h @@ -359,14 +359,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/aria.h b/include/configs/aria.h index c5f9cc1..ffe0929 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -526,14 +526,6 @@
#define CONFIG_HIGH_BATS 1 /* High BATs supported */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 -#define BOOTFLAG_WARM 0x02 - #ifdef CONFIG_CMD_KGDB #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/atc.h b/include/configs/atc.h index 24015b7..620fdb4 100644 --- a/include/configs/atc.h +++ b/include/configs/atc.h @@ -280,14 +280,6 @@ #define CONFIG_ENV_SIZE 2048 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 /* 16-byte page size */ #endif -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ -
/*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/barco.h b/include/configs/barco.h index e00f84a..55f1b9f 100644 --- a/include/configs/barco.h +++ b/include/configs/barco.h @@ -351,15 +351,6 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* values according to the manual */
#define CONFIG_DRAM_50MHZ 1 diff --git a/include/configs/c2mon.h b/include/configs/c2mon.h index 4508d75..3bd8164 100644 --- a/include/configs/c2mon.h +++ b/include/configs/c2mon.h @@ -417,13 +417,4 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/canmb.h b/include/configs/canmb.h index 1f275e5..07d7d0e 100644 --- a/include/configs/canmb.h +++ b/include/configs/canmb.h @@ -35,9 +35,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_HIGH_BATS 1 /* High BATs supported */ diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index 72cf941..9f026e9 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -317,9 +317,6 @@ #define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI #define CONFIG_SYS_HID0_FINAL HID0_ICE
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_XLB_PIPELINING 1 /* enable transaction pipeling */
/* diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h index c3c603b..f3068a9 100644 --- a/include/configs/cmi_mpc5xx.h +++ b/include/configs/cmi_mpc5xx.h @@ -267,13 +267,4 @@ */ #define CONFIG_SYS_DER 0x00000000
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h index 566565a..d5648d6 100644 --- a/include/configs/cogent_mpc8260.h +++ b/include/configs/cogent_mpc8260.h @@ -407,13 +407,4 @@ #endif
#endif - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/cogent_mpc8xx.h b/include/configs/cogent_mpc8xx.h index 750c0df..5b94a3d 100644 --- a/include/configs/cogent_mpc8xx.h +++ b/include/configs/cogent_mpc8xx.h @@ -364,13 +364,4 @@ #define CONFIG_SYS_OR3_PRELIM ((~(CONFIG_SYS_CMA_CS3_SIZE-1)&OR_AM_MSK)|OR_BI|OR_SETA)
#endif - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index d223a4d..f64d519 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -579,14 +579,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #ifdef CONFIG_CMD_KGDB #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/cpci5200.h b/include/configs/cpci5200.h index f7290d6..b4d641d 100644 --- a/include/configs/cpci5200.h +++ b/include/configs/cpci5200.h @@ -47,9 +47,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/csb272.h b/include/configs/csb272.h index 9ded330..5063713 100644 --- a/include/configs/csb272.h +++ b/include/configs/csb272.h @@ -297,13 +297,4 @@ #define CONFIG_SYS_I2C_PLL_ADDR 0x58 /* I2C address of AMIS FS6377-01 PLL */ #define CONFIG_I2CFAST 1 /* enable "i2cfast" env. setting */
-/* - * Internal Definitions - * - * Boot Flags - * - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/csb472.h b/include/configs/csb472.h index 71eb083..415e2e5 100644 --- a/include/configs/csb472.h +++ b/include/configs/csb472.h @@ -295,13 +295,4 @@ */ #define CONFIG_I2CFAST 1 /* enable "i2cfast" env. setting */
-/* - * Internal Definitions - * - * Boot Flags - * - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/debris.h b/include/configs/debris.h index dc59df9..7cd58b2 100644 --- a/include/configs/debris.h +++ b/include/configs/debris.h @@ -451,16 +451,6 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /* values according to the manual */
#define CONFIG_DRAM_50MHZ 1 diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index 7a1a7c3..5c0de7a 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -42,9 +42,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000
-#define BOOTFLAG_COLD 0x01 -#define BOOTFLAG_WARM 0x02 - #define CONFIG_SYS_CACHELINE_SIZE 32
/* diff --git a/include/configs/eXalion.h b/include/configs/eXalion.h index 85bf236..6f9b655 100644 --- a/include/configs/eXalion.h +++ b/include/configs/eXalion.h @@ -412,16 +412,6 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
- -/*----------------------------------------------------------------------- - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /* values according to the manual */ #define CONFIG_DRAM_50MHZ 1 #define CONFIG_SDRAM_50MHZ diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h index a738425..4a99ca6 100644 --- a/include/configs/ep8248.h +++ b/include/configs/ep8248.h @@ -232,9 +232,6 @@ #define CONFIG_SYS_HRCW_SLAVE6 0 #define CONFIG_SYS_HRCW_SLAVE7 0
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_MALLOC_LEN (4096 << 10) /* Reserve 4 MB for malloc() */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h index 3f4425a..ecc8a09 100644 --- a/include/configs/ep8260.h +++ b/include/configs/ep8260.h @@ -746,14 +746,6 @@ #endif
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * JFFS2 partitions * */ diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h index b52b941..83b57c5 100644 --- a/include/configs/ep82xxm.h +++ b/include/configs/ep82xxm.h @@ -361,9 +361,6 @@ #define CONFIG_SYS_HRCW_SLAVE6 0 #define CONFIG_SYS_HRCW_SLAVE7 0
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_MALLOC_LEN (4096 << 10) /* Reserve 4 MB for malloc() */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
diff --git a/include/configs/galaxy5200.h b/include/configs/galaxy5200.h index 29951f7..b802dca 100644 --- a/include/configs/galaxy5200.h +++ b/include/configs/galaxy5200.h @@ -42,8 +42,6 @@ #define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */ #define CONFIG_SYS_MPC5XXX_CLKIN 33333333 /* ... running at 33.333333MHz */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */
/* * Serial console configuration diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h index 9ed3846..5f64b93 100644 --- a/include/configs/gw8260.h +++ b/include/configs/gw8260.h @@ -819,13 +819,4 @@ ORxG_SCY_11_CLK |\ ORxG_EHTR) #endif /* CONFIG_SYS_IO_BASE */ - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/hermes.h b/include/configs/hermes.h index 0df46fa..818bfd2 100644 --- a/include/configs/hermes.h +++ b/include/configs/hermes.h @@ -332,13 +332,4 @@ #define CONFIG_SYS_MAMR_9COL ((CONFIG_SYS_MAMR_PTA << MAMR_PTA_SHIFT) | MAMR_PTAE | \ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X) - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h index f9cdcbc..ac7ef06 100644 --- a/include/configs/hmi1001.h +++ b/include/configs/hmi1001.h @@ -35,9 +35,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_HIGH_BATS 1 /* High BATs supported */ diff --git a/include/configs/hymod.h b/include/configs/hymod.h index 5a282ff..0591c51 100644 --- a/include/configs/hymod.h +++ b/include/configs/hymod.h @@ -728,14 +728,6 @@ #define FPGA_MAIN_IRQ SIU_INT_IRQ2
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * JFFS2 partitions * */ diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index c5b1565..7b28cba 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -38,9 +38,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_MISC_INIT_F 1 /* Use misc_init_f() */
#define CONFIG_HIGH_BATS 1 /* High BATs supported */ diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index 6903b36..66338bf 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -41,9 +41,6 @@
#define CONFIG_MISC_INIT_R
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */ #ifdef CONFIG_CMD_KGDB #define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h index 9c45acf..32bd4ee 100644 --- a/include/configs/jupiter.h +++ b/include/configs/jupiter.h @@ -38,9 +38,6 @@ #define CONFIG_BOARD_EARLY_INIT_R 1 #define CONFIG_BOARD_EARLY_INIT_F 1
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/km8xx.h b/include/configs/km8xx.h index a10744e..2a42e99 100644 --- a/include/configs/km8xx.h +++ b/include/configs/km8xx.h @@ -271,14 +271,6 @@ #define CONFIG_SYS_BR3_PRELIM (0x30000401) #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SCC3_ENET #define CONFIG_ETHPRIME "SCC" #define CONFIG_HAS_ETH0 diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h index f7d36b1..9ef4b82 100644 --- a/include/configs/kmeter1.h +++ b/include/configs/kmeter1.h @@ -441,14 +441,6 @@ #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U #endif /* CONFIG_PCI */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define BOOTFLASH_START F0000000
#define CONFIG_PRAM 512 /* protected RAM [KBytes] */ diff --git a/include/configs/korat.h b/include/configs/korat.h index f95df68..3c0b4bd 100644 --- a/include/configs/korat.h +++ b/include/configs/korat.h @@ -553,14 +553,6 @@ } \ }
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/kvme080.h b/include/configs/kvme080.h index 0d95263..b406c11 100644 --- a/include/configs/kvme080.h +++ b/include/configs/kvme080.h @@ -268,7 +268,4 @@ #define CONFIG_SYS_DBAT3L CONFIG_SYS_IBAT3L #define CONFIG_SYS_DBAT3U CONFIG_SYS_IBAT3U
-#define BOOTFLAG_COLD 0x01 -#define BOOTFLAG_WARM 0x02 - #endif /* __CONFIG_H */ diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h index 6883e79..7c3eb64 100644 --- a/include/configs/linkstation.h +++ b/include/configs/linkstation.h @@ -495,12 +495,4 @@ */ #define CONFIG_DOS_PARTITION
-/*----------------------------------------------------------------------- - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h index be20d72..8f31f38 100644 --- a/include/configs/lwmon.h +++ b/include/configs/lwmon.h @@ -610,12 +610,4 @@ */ #define CONFIG_SYS_MAR 0x00000088
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 6461124..b3a951b 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -608,14 +608,6 @@ } \ }
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/manroland/common.h b/include/configs/manroland/common.h index 0224608..01323c1 100644 --- a/include/configs/manroland/common.h +++ b/include/configs/manroland/common.h @@ -29,9 +29,6 @@ * (easy to change) */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_BOARD_EARLY_INIT_R
/* Partitions */ diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h index 7ef6385..0e9f346 100644 --- a/include/configs/mcc200.h +++ b/include/configs/mcc200.h @@ -37,9 +37,6 @@
#define CONFIG_MISC_INIT_R
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h index 92c4f5f..e7f9db1 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -362,14 +362,6 @@
#define CONFIG_HIGH_BATS 1 /* High BATs supported */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #ifdef CONFIG_CMD_KGDB #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h index 73405ea..846a51a 100644 --- a/include/configs/mecp5200.h +++ b/include/configs/mecp5200.h @@ -47,9 +47,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h index 55d1fc9..9152d2b 100644 --- a/include/configs/mgcoge.h +++ b/include/configs/mgcoge.h @@ -193,9 +193,6 @@ #define CONFIG_SYS_HRCW_SLAVE6 0 #define CONFIG_SYS_HRCW_SLAVE7 0
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
#define CONFIG_SYS_CACHELINE_SIZE 32 /* For MPC8260 CPUs */ diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index fa4310b..dff77a0 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -411,9 +411,6 @@ extern void __led_set(led_id_t id, int state); #define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI #define CONFIG_SYS_HID0_FINAL HID0_ICE
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 5281042..3783b6b 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -495,14 +495,6 @@
#define CONFIG_HIGH_BATS 1 /* High BATs supported */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #ifdef CONFIG_CMD_KGDB #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h index 497ea42..328356f 100644 --- a/include/configs/mpc7448hpc2.h +++ b/include/configs/mpc7448hpc2.h @@ -399,13 +399,5 @@
#define L2_INIT 0 #define L2_ENABLE (L2_INIT | L2CR_L2E) - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ #define CONFIG_SYS_SERIAL_HANG_IN_EXCEPTION #endif /* __CONFIG_H */ diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h index 43f46bf..7f184ae 100644 --- a/include/configs/muas3001.h +++ b/include/configs/muas3001.h @@ -275,9 +275,6 @@ #define CONFIG_SYS_HRCW_SLAVE6 0 #define CONFIG_SYS_HRCW_SLAVE7 0
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_MALLOC_LEN (4096 << 10) /* Reserve 4 MB for malloc() */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
diff --git a/include/configs/munices.h b/include/configs/munices.h index fa5230f..270f608 100644 --- a/include/configs/munices.h +++ b/include/configs/munices.h @@ -32,8 +32,6 @@ #define CONFIG_MPC5200_DDR 1 /* (with DDR-SDRAM) */ #define CONFIG_MUNICES 1 /* ... on MUNICes board */ #define CONFIG_SYS_MPC5XXX_CLKIN 33333333 /* ... running at 33.333333MHz */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ #define CONFIG_SYS_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */ #define CONFIG_HIGH_BATS 1 /* High BATs supported */
diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h index bdc0f79..a30529b 100644 --- a/include/configs/o2dnt.h +++ b/include/configs/o2dnt.h @@ -34,9 +34,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h index 17ec08f..323808e 100644 --- a/include/configs/p3mx.h +++ b/include/configs/p3mx.h @@ -447,12 +447,4 @@
#define L2_ENABLE (L2_INIT | L2CR_L2E)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h index d6b9207..07155ce 100644 --- a/include/configs/p3p440.h +++ b/include/configs/p3p440.h @@ -313,14 +313,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h index 8acf3c7..651eabf 100644 --- a/include/configs/pcm030.h +++ b/include/configs/pcm030.h @@ -42,8 +42,6 @@ High Level Configuration Options #define CONFIG_PHYCORE_MPC5200B_TINY 1 /* phyCORE-MPC5200B -> */ /* FEC configuration and IDE */ #define CONFIG_SYS_MPC5XXX_CLKIN 33333333 /* ... running at 33.333333MHz */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */
/*----------------------------------------------------------------------------- Serial console configuration diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h index 1f744b8..1f03337 100644 --- a/include/configs/pcs440ep.h +++ b/include/configs/pcs440ep.h @@ -441,14 +441,6 @@ } \ }
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/pcu_e.h b/include/configs/pcu_e.h index 3aee206..4d18583 100644 --- a/include/configs/pcu_e.h +++ b/include/configs/pcu_e.h @@ -539,12 +539,4 @@ MAMR_WLFA_1X | \ MAMR_TLFA_8X )
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h index 718abdf..dd71c7a 100644 --- a/include/configs/pdm360ng.h +++ b/include/configs/pdm360ng.h @@ -432,14 +432,6 @@
#define CONFIG_HIGH_BATS 1 /* High BATs supported */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #ifdef CONFIG_CMD_KGDB #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/pf5200.h b/include/configs/pf5200.h index 80a0bc6..d3f78d6 100644 --- a/include/configs/pf5200.h +++ b/include/configs/pf5200.h @@ -46,9 +46,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */ /* * Serial console configuration diff --git a/include/configs/ppmc7xx.h b/include/configs/ppmc7xx.h index 04779c4..646f4e4 100644 --- a/include/configs/ppmc7xx.h +++ b/include/configs/ppmc7xx.h @@ -414,16 +414,4 @@
#define CONFIG_SYS_BOARD_ASM_INIT
- -/* - * Boot flags - * - * BOOTFLAG_COLD - Indicates a power-on boot - * BOOTFLAG_WARM - Indicates a software reset - */ - -#define BOOTFLAG_COLD 0x01 -#define BOOTFLAG_WARM 0x02 - - #endif /* __CONFIG_H */ diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h index f387601..06151af 100644 --- a/include/configs/ppmc8260.h +++ b/include/configs/ppmc8260.h @@ -1004,13 +1004,4 @@ ORxG_TRLX |\ ORxG_EHTR) #endif /* CONFIG_SYS_LED_BASE */ - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/quantum.h b/include/configs/quantum.h index e440e93..1665217 100644 --- a/include/configs/quantum.h +++ b/include/configs/quantum.h @@ -405,14 +405,6 @@ MAMR_RLFA_16X | MAMR_WLFA_16X | MAMR_TLFA_16X)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * BCSRx * * Board Status and Control Registers diff --git a/include/configs/rmu.h b/include/configs/rmu.h index 026826b..75e8bc5 100644 --- a/include/configs/rmu.h +++ b/include/configs/rmu.h @@ -381,14 +381,6 @@ MAMR_RLFA_16X | MAMR_WLFA_16X | MAMR_TLFA_16X)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * BCSRx * * Board Status and Control Registers diff --git a/include/configs/rsdproto.h b/include/configs/rsdproto.h index 8207844..d4c57ce 100644 --- a/include/configs/rsdproto.h +++ b/include/configs/rsdproto.h @@ -419,12 +419,4 @@ #define CONFIG_SYS_OR5_PRELIM (P2SZ_TO_AM(PHYS_DPRAM_SHARC_SIZE) | \ ORxG_ACS_DIV4)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h index b0198aa..1a77bbc 100644 --- a/include/configs/sacsng.h +++ b/include/configs/sacsng.h @@ -1062,12 +1062,4 @@ ORxG_EHTR) #endif /* (defined(CONFIG_SYS_FLASH1_BASE) && defined(CONFIG_SYS_FLASH1_SIZE)) */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h index 429b11c..409d52f 100644 --- a/include/configs/sbc405.h +++ b/include/configs/sbc405.h @@ -268,12 +268,4 @@ #define SPD_EEPROM_ADDRESS 0x50 #define CONFIG_SPD_EEPROM 1 /* use SPD EEPROM for setup */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/sbc8240.h b/include/configs/sbc8240.h index 1cc2920..f657d49 100644 --- a/include/configs/sbc8240.h +++ b/include/configs/sbc8240.h @@ -353,14 +353,6 @@ typedef unsigned int led_id_t; # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /*----------------------------------------------------------------------- * PCI stuff *----------------------------------------------------------------------- diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h index 3fa80a8..e71c491 100644 --- a/include/configs/sbc8260.h +++ b/include/configs/sbc8260.h @@ -1076,13 +1076,4 @@ ORxG_TRLX |\ ORxG_EHTR) #endif /* CONFIG_SYS_LED_BASE */ - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index deaddde..40f8547 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -613,14 +613,6 @@ #define CONFIG_SYS_DBAT7L CONFIG_SYS_IBAT7L #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index 564f661..bc2ce90 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -517,14 +517,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h index 53d06ed..0a4a758 100644 --- a/include/configs/sbc8560.h +++ b/include/configs/sbc8560.h @@ -423,14 +423,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 618513a..a4585a7 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -541,14 +541,6 @@ #define CONFIG_SYS_CACHELINE_SHIFT 5 /*log base 2 of the above value*/ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/sc3.h b/include/configs/sc3.h index 19084ce..b910950 100644 --- a/include/configs/sc3.h +++ b/include/configs/sc3.h @@ -487,14 +487,6 @@ /* Initial value of the stack pointern in internal SRAM */ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* ################################################################################### */ /* These defines will be used in arch/powerpc/cpu/ppc4xx/cpu_init.c to setup external chip selects */ /* They are currently undefined cause they are initiaized in board/solidcard3/init.S */ diff --git a/include/configs/smmaco4.h b/include/configs/smmaco4.h index 060026b..ac14606 100644 --- a/include/configs/smmaco4.h +++ b/include/configs/smmaco4.h @@ -39,9 +39,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/socrates.h b/include/configs/socrates.h index af1e19e..71241c4 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -389,14 +389,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port*/ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h index 5db1379..970974c 100644 --- a/include/configs/sorcery.h +++ b/include/configs/sorcery.h @@ -38,9 +38,6 @@ #define CONFIG_SYS_MPC8220_CLKIN 60000000 /* ... running at 60MHz */ #define CONFIG_SYS_MPC8220_SYSPLL_VCO_MULTIPLIER 8 /* VCO multiplier can't be read from any register */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* * Serial console configuration */ diff --git a/include/configs/spc1920.h b/include/configs/spc1920.h index 1fe2a04..87adaa0 100644 --- a/include/configs/spc1920.h +++ b/include/configs/spc1920.h @@ -422,12 +422,4 @@
#define CONFIG_SYS_BR5_PRELIM ((CONFIG_SYS_SPC1920_PLD_BASE & BR_BA_MSK) | BR_PS_8 | BR_V)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/spieval.h b/include/configs/spieval.h index d377e19..3ce2a31 100644 --- a/include/configs/spieval.h +++ b/include/configs/spieval.h @@ -41,9 +41,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h index 891d2bf..3a996c2 100644 --- a/include/configs/stxgp3.h +++ b/include/configs/stxgp3.h @@ -364,14 +364,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h index 57bb8d1..5154c70 100644 --- a/include/configs/stxssa.h +++ b/include/configs/stxssa.h @@ -397,14 +397,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h index 5854366..65496ba 100644 --- a/include/configs/stxxtc.h +++ b/include/configs/stxxtc.h @@ -430,14 +430,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_LAST_STAGE_INIT /* needed to reset the damn phys */
/****************************************************************/ diff --git a/include/configs/svm_sc8xx.h b/include/configs/svm_sc8xx.h index 425f472..4f653ff 100644 --- a/include/configs/svm_sc8xx.h +++ b/include/configs/svm_sc8xx.h @@ -465,13 +465,4 @@ #define CONFIG_SYS_DOC_SUPPORT_MILLENNIUM #define CONFIG_SYS_DOC_BASE 0x80000000
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/uc100.h b/include/configs/uc100.h index 23f4c82..6b6be86 100644 --- a/include/configs/uc100.h +++ b/include/configs/uc100.h @@ -499,14 +499,6 @@ #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 /* takes up to 10 msec */ #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_FEC_ENET 1 /* use FEC ethernet */ #define FEC_ENET #define CONFIG_MII diff --git a/include/configs/utx8245.h b/include/configs/utx8245.h index 1a47aad..fa37976 100644 --- a/include/configs/utx8245.h +++ b/include/configs/utx8245.h @@ -425,13 +425,4 @@ protect on ${u-boot_startaddr} ${u-boot_endaddr}" # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - #endif /* __CONFIG_H */ diff --git a/include/configs/v37.h b/include/configs/v37.h index 7f1670e..a2f6be3 100644 --- a/include/configs/v37.h +++ b/include/configs/v37.h @@ -391,12 +391,4 @@ MAMR_AMA_TYPE_2 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A12 | \ MAMR_GPL_A4DIS | MAMR_RLFA_4X | MAMR_WLFA_3X | MAMR_TLFA_16X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/v38b.h b/include/configs/v38b.h index 600ccfb..92ea86c 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -44,9 +44,6 @@
#define CONFIG_SYS_XLB_PIPELINING 1 /* gives better performance */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index 56d24f9..1657c95 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -475,14 +475,6 @@ #define CONFIG_SYS_DBAT7L CONFIG_SYS_IBAT7L #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_NETDEV eth0
#define CONFIG_HOSTNAME ve8313 diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h index 7046e67..57b0d0b 100644 --- a/include/configs/virtlab2.h +++ b/include/configs/virtlab2.h @@ -475,15 +475,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* Map peripheral control registers on CS4 */ #define CONFIG_SYS_PERIPHERAL_BASE 0xA0000000 #define CONFIG_SYS_PERIPHERAL_OR_AM 0xFFFF8000 /* 32 kB address mask */ diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index f493e75..103325e 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -539,14 +539,6 @@ #define CONFIG_SYS_DBAT7L CONFIG_SYS_IBAT7L #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/zeus.h b/include/configs/zeus.h index 3b2aede..7304a78 100644 --- a/include/configs/zeus.h +++ b/include/configs/zeus.h @@ -297,14 +297,6 @@ #define CONFIG_SYS_TIME_POST 5000 #define CONFIG_SYS_TIME_FACTORY_RESET 10000
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
Dear Peter Tyser,
In message 1284509634-11899-5-git-send-email-ptyser@xes-inc.com you wrote:
Now that warm booting is not supported, there isn't a need for the BOOTFLAG_COLD and BOOTFLAG_WARM defines, so remove them.
Note that this change makes the board info bd_bootflags field useless. It will always be set to 0, but we leave it around so that we don't break the board info structure that some OSes are expecting to be passed from U-Boot.
Signed-off-by: Peter Tyser ptyser@xes-inc.com
Sorry, this does not apply any more:
Applying: powerpc: Cleanup BOOTFLAG_* references fatal: sha1 information is lacking or useless (arch/powerpc/lib/board.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 powerpc: Cleanup BOOTFLAG_* references
Can you please have a look?
Best regards,
Wolfgang Denk
Now that warm booting is not supported, there isn't a need for the BOOTFLAG_COLD and BOOTFLAG_WARM defines, so remove them.
Note that this change makes the board info bd_bootflags field useless. It will always be set to 0, but we leave it around so that we don't break the board info structure that some OSes are expecting to be passed from U-Boot.
Signed-off-by: Peter Tyser ptyser@xes-inc.com --- Changes since v1: - Rebased
arch/powerpc/cpu/74xx_7xx/start.S | 1 + arch/powerpc/cpu/mpc512x/start.S | 1 + arch/powerpc/cpu/mpc5xx/start.S | 1 + arch/powerpc/cpu/mpc5xxx/start.S | 1 + arch/powerpc/cpu/mpc8220/start.S | 1 + arch/powerpc/cpu/mpc824x/start.S | 1 + arch/powerpc/cpu/mpc8260/start.S | 1 + arch/powerpc/cpu/mpc83xx/start.S | 1 + arch/powerpc/cpu/mpc86xx/start.S | 1 + arch/powerpc/cpu/mpc8xx/start.S | 1 + arch/powerpc/include/asm/u-boot.h | 2 +- arch/powerpc/lib/board.c | 2 -- board/fads/fads.h | 8 -------- include/configs/A3000.h | 8 -------- include/configs/ADCIOP.h | 9 --------- include/configs/AMX860.h | 8 -------- include/configs/AP1000.h | 8 -------- include/configs/APC405.h | 8 -------- include/configs/AR405.h | 8 -------- include/configs/ASH405.h | 8 -------- include/configs/ATUM8548.h | 8 -------- include/configs/Adder.h | 8 -------- include/configs/Alaska8220.h | 3 --- include/configs/BAB7xx.h | 9 --------- include/configs/BC3450.h | 3 --- include/configs/BMW.h | 9 --------- include/configs/CANBT.h | 9 --------- include/configs/CATcenter.h | 9 --------- include/configs/CMS700.h | 8 -------- include/configs/CPC45.h | 10 ---------- include/configs/CPCI2DP.h | 8 -------- include/configs/CPCI405.h | 9 --------- include/configs/CPCI4052.h | 9 --------- include/configs/CPCI405AB.h | 9 --------- include/configs/CPCI405DT.h | 8 -------- include/configs/CPCI750.h | 8 -------- include/configs/CPCIISER4.h | 8 -------- include/configs/CPU86.h | 9 --------- include/configs/CPU87.h | 9 --------- include/configs/CRAYL1.h | 8 -------- include/configs/CU824.h | 8 -------- include/configs/DASA_SIM.h | 9 --------- include/configs/DB64360.h | 8 -------- include/configs/DB64460.h | 8 -------- include/configs/DP405.h | 8 -------- include/configs/DU405.h | 9 --------- include/configs/DU440.h | 8 -------- include/configs/ELPPC.h | 8 -------- include/configs/ELPT860.h | 13 ------------- include/configs/EP88x.h | 8 -------- include/configs/ERIC.h | 8 -------- include/configs/ESTEEM192E.h | 18 ------------------ include/configs/ETX094.h | 9 --------- include/configs/EVB64260.h | 8 -------- include/configs/EXBITGEN.h | 8 -------- include/configs/FADS823.h | 7 ------- include/configs/FADS850SAR.h | 8 -------- include/configs/FLAGADM.h | 8 -------- include/configs/FPS850L.h | 9 --------- include/configs/FPS860L.h | 9 --------- include/configs/G2000.h | 8 -------- include/configs/GEN860T.h | 6 ------ include/configs/GENIETV.h | 8 -------- include/configs/HH405.h | 8 -------- include/configs/HIDDEN_DRAGON.h | 8 -------- include/configs/HUB405.h | 8 -------- include/configs/IAD210.h | 9 --------- include/configs/ICU862.h | 7 ------- include/configs/IDS8247.h | 9 --------- include/configs/IP860.h | 14 -------------- include/configs/IPHASE4539.h | 9 --------- include/configs/ISPAN.h | 8 -------- include/configs/IVML24.h | 9 --------- include/configs/IVMS8.h | 9 --------- include/configs/IceCube.h | 3 --- include/configs/JSE.h | 9 --------- include/configs/KAREF.h | 8 -------- include/configs/KUP4K.h | 9 --------- include/configs/KUP4X.h | 9 --------- include/configs/LANTEC.h | 8 -------- include/configs/MBX.h | 8 -------- include/configs/MBX860T.h | 8 -------- include/configs/METROBOX.h | 8 -------- include/configs/MHPC.h | 8 -------- include/configs/MIP405.h | 9 --------- include/configs/ML2.h | 8 -------- include/configs/MOUSSE.h | 9 --------- include/configs/MPC8260ADS.h | 3 --- include/configs/MPC8266ADS.h | 3 --- include/configs/MPC8308RDB.h | 8 -------- include/configs/MPC8313ERDB.h | 8 -------- include/configs/MPC8315ERDB.h | 8 -------- include/configs/MPC8323ERDB.h | 8 -------- include/configs/MPC832XEMDS.h | 8 -------- include/configs/MPC8349EMDS.h | 8 -------- include/configs/MPC8349ITX.h | 8 -------- include/configs/MPC8360EMDS.h | 8 -------- include/configs/MPC8360ERDK.h | 8 -------- include/configs/MPC837XEMDS.h | 8 -------- include/configs/MPC837XERDB.h | 8 -------- include/configs/MPC8536DS.h | 8 -------- include/configs/MPC8540ADS.h | 8 -------- include/configs/MPC8540EVAL.h | 8 -------- include/configs/MPC8541CDS.h | 8 -------- include/configs/MPC8544DS.h | 8 -------- include/configs/MPC8548CDS.h | 8 -------- include/configs/MPC8555CDS.h | 8 -------- include/configs/MPC8560ADS.h | 8 -------- include/configs/MPC8568MDS.h | 8 -------- include/configs/MPC8569MDS.h | 8 -------- include/configs/MPC8572DS.h | 8 -------- include/configs/MPC8610HPCD.h | 8 -------- include/configs/MPC8641HPCN.h | 8 -------- include/configs/MUSENKI.h | 8 -------- include/configs/MVBC_P.h | 3 --- include/configs/MVBLM7.h | 9 --------- include/configs/MVBLUE.h | 9 --------- include/configs/MVS1.h | 9 --------- include/configs/MVSMR.h | 3 --- include/configs/NC650.h | 8 -------- include/configs/NETPHONE.h | 8 -------- include/configs/NETTA.h | 8 -------- include/configs/NETTA2.h | 8 -------- include/configs/NETVIA.h | 8 -------- include/configs/NSCU.h | 9 --------- include/configs/NX823.h | 9 --------- include/configs/OCRTC.h | 9 --------- include/configs/ORSG.h | 9 --------- include/configs/OXC.h | 9 --------- include/configs/P1022DS.h | 8 -------- include/configs/P1_P2_RDB.h | 8 -------- include/configs/P2020DS.h | 8 -------- include/configs/P3G4.h | 8 -------- include/configs/PATI.h | 10 ---------- include/configs/PCI405.h | 8 -------- include/configs/PCIPPC2.h | 8 -------- include/configs/PCIPPC6.h | 8 -------- include/configs/PIP405.h | 9 --------- include/configs/PLU405.h | 8 -------- include/configs/PM520.h | 3 --- include/configs/PM826.h | 9 --------- include/configs/PM828.h | 9 --------- include/configs/PM854.h | 8 -------- include/configs/PM856.h | 8 -------- include/configs/PMC405.h | 8 -------- include/configs/PMC440.h | 8 -------- include/configs/PN62.h | 10 ---------- include/configs/PPChameleonEVB.h | 9 --------- include/configs/QS823.h | 8 -------- include/configs/QS850.h | 8 -------- include/configs/QS860T.h | 9 --------- include/configs/R360MPI.h | 9 --------- include/configs/RBC823.h | 9 --------- include/configs/RPXClassic.h | 9 --------- include/configs/RPXlite.h | 9 --------- include/configs/RPXlite_DW.h | 8 -------- include/configs/RPXsuper.h | 8 -------- include/configs/RRvision.h | 8 -------- include/configs/Rattler.h | 3 --- include/configs/SBC8540.h | 8 -------- include/configs/SCM.h | 9 --------- include/configs/SIMPC8313.h | 8 -------- include/configs/SM850.h | 9 --------- include/configs/SPD823TS.h | 8 -------- include/configs/SXNI855T.h | 7 ------- include/configs/Sandpoint8240.h | 10 ---------- include/configs/Sandpoint8245.h | 10 ---------- include/configs/TB5200.h | 3 --- include/configs/TK885D.h | 8 -------- include/configs/TOP5200.h | 3 --- include/configs/TOP860.h | 8 -------- include/configs/TQM5200.h | 3 --- include/configs/TQM823L.h | 9 --------- include/configs/TQM823M.h | 9 --------- include/configs/TQM8260.h | 9 --------- include/configs/TQM8272.h | 8 -------- include/configs/TQM834x.h | 8 -------- include/configs/TQM850L.h | 9 --------- include/configs/TQM850M.h | 9 --------- include/configs/TQM855L.h | 9 --------- include/configs/TQM855M.h | 9 --------- include/configs/TQM85xx.h | 8 -------- include/configs/TQM860L.h | 9 --------- include/configs/TQM860M.h | 8 -------- include/configs/TQM862L.h | 9 --------- include/configs/TQM862M.h | 9 --------- include/configs/TQM866M.h | 8 -------- include/configs/TQM885D.h | 8 -------- include/configs/Total5200.h | 3 --- include/configs/VOH405.h | 8 -------- include/configs/VOM405.h | 8 -------- include/configs/VoVPN-GW.h | 4 ---- include/configs/W7OLMC.h | 9 --------- include/configs/W7OLMG.h | 9 --------- include/configs/WUH405.h | 8 -------- include/configs/XPEDITE1000.h | 6 ------ include/configs/XPEDITE5170.h | 6 ------ include/configs/XPEDITE5200.h | 6 ------ include/configs/XPEDITE5370.h | 6 ------ include/configs/Yukon8220.h | 3 --- include/configs/ZPC1900.h | 3 --- include/configs/ZUMA.h | 8 -------- include/configs/a4m072.h | 3 --- include/configs/aev.h | 3 --- include/configs/alpr.h | 8 -------- include/configs/aria.h | 8 -------- include/configs/atc.h | 8 -------- include/configs/barco.h | 9 --------- include/configs/c2mon.h | 9 --------- include/configs/canmb.h | 3 --- include/configs/cm5200.h | 3 --- include/configs/cmi_mpc5xx.h | 9 --------- include/configs/cogent_mpc8260.h | 9 --------- include/configs/cogent_mpc8xx.h | 9 --------- include/configs/corenet_ds.h | 8 -------- include/configs/cpci5200.h | 3 --- include/configs/csb272.h | 9 --------- include/configs/csb472.h | 9 --------- include/configs/debris.h | 10 ---------- include/configs/digsy_mtc.h | 3 --- include/configs/eXalion.h | 10 ---------- include/configs/ep8248.h | 3 --- include/configs/ep8260.h | 8 -------- include/configs/ep82xxm.h | 3 --- include/configs/galaxy5200.h | 2 -- include/configs/gw8260.h | 9 --------- include/configs/hermes.h | 9 --------- include/configs/hmi1001.h | 3 --- include/configs/hymod.h | 8 -------- include/configs/inka4x0.h | 3 --- include/configs/ipek01.h | 3 --- include/configs/jupiter.h | 3 --- include/configs/km8xx.h | 8 -------- include/configs/kmeter1.h | 8 -------- include/configs/korat.h | 8 -------- include/configs/kvme080.h | 3 --- include/configs/linkstation.h | 8 -------- include/configs/lwmon.h | 8 -------- include/configs/lwmon5.h | 8 -------- include/configs/manroland/common.h | 3 --- include/configs/mcc200.h | 3 --- include/configs/mecp5123.h | 8 -------- include/configs/mecp5200.h | 3 --- include/configs/mgcoge.h | 3 --- include/configs/motionpro.h | 3 --- include/configs/mpc5121ads.h | 8 -------- include/configs/mpc7448hpc2.h | 8 -------- include/configs/mpc8308_p1m.h | 8 -------- include/configs/muas3001.h | 3 --- include/configs/munices.h | 2 -- include/configs/o2dnt.h | 3 --- include/configs/p3mx.h | 8 -------- include/configs/p3p440.h | 8 -------- include/configs/pcm030.h | 2 -- include/configs/pcs440ep.h | 8 -------- include/configs/pdm360ng.h | 8 -------- include/configs/pf5200.h | 3 --- include/configs/ppmc7xx.h | 12 ------------ include/configs/ppmc8260.h | 9 --------- include/configs/quantum.h | 8 -------- include/configs/rmu.h | 8 -------- include/configs/rsdproto.h | 8 -------- include/configs/sacsng.h | 8 -------- include/configs/sbc405.h | 8 -------- include/configs/sbc8240.h | 8 -------- include/configs/sbc8260.h | 9 --------- include/configs/sbc8349.h | 8 -------- include/configs/sbc8548.h | 8 -------- include/configs/sbc8560.h | 8 -------- include/configs/sbc8641d.h | 8 -------- include/configs/sc3.h | 8 -------- include/configs/socrates.h | 8 -------- include/configs/sorcery.h | 3 --- include/configs/spc1920.h | 8 -------- include/configs/spieval.h | 3 --- include/configs/stxgp3.h | 8 -------- include/configs/stxssa.h | 8 -------- include/configs/stxxtc.h | 8 -------- include/configs/svm_sc8xx.h | 9 --------- include/configs/uc100.h | 8 -------- include/configs/utx8245.h | 9 --------- include/configs/v37.h | 8 -------- include/configs/v38b.h | 3 --- include/configs/ve8313.h | 8 -------- include/configs/virtlab2.h | 9 --------- include/configs/vme8349.h | 8 -------- include/configs/zeus.h | 8 -------- 287 files changed, 11 insertions(+), 2082 deletions(-)
diff --git a/arch/powerpc/cpu/74xx_7xx/start.S b/arch/powerpc/cpu/74xx_7xx/start.S index 47694aa..e10c44c 100644 --- a/arch/powerpc/cpu/74xx_7xx/start.S +++ b/arch/powerpc/cpu/74xx_7xx/start.S @@ -42,6 +42,7 @@
#include <asm/cache.h> #include <asm/mmu.h> +#include <asm/u-boot.h>
#if !defined(CONFIG_DB64360) && \ !defined(CONFIG_DB64460) && \ diff --git a/arch/powerpc/cpu/mpc512x/start.S b/arch/powerpc/cpu/mpc512x/start.S index 1047c51..d52cc4d 100644 --- a/arch/powerpc/cpu/mpc512x/start.S +++ b/arch/powerpc/cpu/mpc512x/start.S @@ -43,6 +43,7 @@
#include <asm/cache.h> #include <asm/mmu.h> +#include <asm/u-boot.h>
#ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "MPC512X" diff --git a/arch/powerpc/cpu/mpc5xx/start.S b/arch/powerpc/cpu/mpc5xx/start.S index 4fd9b63..26b9eac 100644 --- a/arch/powerpc/cpu/mpc5xx/start.S +++ b/arch/powerpc/cpu/mpc5xx/start.S @@ -43,6 +43,7 @@
#include <linux/config.h> #include <asm/processor.h> +#include <asm/u-boot.h>
#ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" diff --git a/arch/powerpc/cpu/mpc5xxx/start.S b/arch/powerpc/cpu/mpc5xxx/start.S index 1385869..8b683b1 100644 --- a/arch/powerpc/cpu/mpc5xxx/start.S +++ b/arch/powerpc/cpu/mpc5xxx/start.S @@ -38,6 +38,7 @@
#include <asm/cache.h> #include <asm/mmu.h> +#include <asm/u-boot.h>
#ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" diff --git a/arch/powerpc/cpu/mpc8220/start.S b/arch/powerpc/cpu/mpc8220/start.S index c156e25..320ad4e 100644 --- a/arch/powerpc/cpu/mpc8220/start.S +++ b/arch/powerpc/cpu/mpc8220/start.S @@ -37,6 +37,7 @@
#include <asm/cache.h> #include <asm/mmu.h> +#include <asm/u-boot.h>
#ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" diff --git a/arch/powerpc/cpu/mpc824x/start.S b/arch/powerpc/cpu/mpc824x/start.S index 5b126bb..3c44c00 100644 --- a/arch/powerpc/cpu/mpc824x/start.S +++ b/arch/powerpc/cpu/mpc824x/start.S @@ -49,6 +49,7 @@
#include <asm/cache.h> #include <asm/mmu.h> +#include <asm/u-boot.h>
#ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" diff --git a/arch/powerpc/cpu/mpc8260/start.S b/arch/powerpc/cpu/mpc8260/start.S index 9485afa..48105e7 100644 --- a/arch/powerpc/cpu/mpc8260/start.S +++ b/arch/powerpc/cpu/mpc8260/start.S @@ -38,6 +38,7 @@
#include <asm/cache.h> #include <asm/mmu.h> +#include <asm/u-boot.h>
#ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S index bdce915..450cfb5 100644 --- a/arch/powerpc/cpu/mpc83xx/start.S +++ b/arch/powerpc/cpu/mpc83xx/start.S @@ -40,6 +40,7 @@
#include <asm/cache.h> #include <asm/mmu.h> +#include <asm/u-boot.h>
#ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "MPC83XX" diff --git a/arch/powerpc/cpu/mpc86xx/start.S b/arch/powerpc/cpu/mpc86xx/start.S index 596053f..6127e01 100644 --- a/arch/powerpc/cpu/mpc86xx/start.S +++ b/arch/powerpc/cpu/mpc86xx/start.S @@ -40,6 +40,7 @@
#include <asm/cache.h> #include <asm/mmu.h> +#include <asm/u-boot.h>
#ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" diff --git a/arch/powerpc/cpu/mpc8xx/start.S b/arch/powerpc/cpu/mpc8xx/start.S index d6100ec..6073dab 100644 --- a/arch/powerpc/cpu/mpc8xx/start.S +++ b/arch/powerpc/cpu/mpc8xx/start.S @@ -50,6 +50,7 @@
#include <asm/cache.h> #include <asm/mmu.h> +#include <asm/u-boot.h>
#ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" diff --git a/arch/powerpc/include/asm/u-boot.h b/arch/powerpc/include/asm/u-boot.h index ea2d22d..b377705 100644 --- a/arch/powerpc/include/asm/u-boot.h +++ b/arch/powerpc/include/asm/u-boot.h @@ -62,7 +62,7 @@ typedef struct bd_info { unsigned long bi_flbfreq; /* Flexbus Freq, in MHz */ unsigned long bi_vcofreq; /* VCO Freq, in MHz */ #endif - unsigned long bi_bootflags; /* boot / reboot flag (for LynxOS) */ + unsigned long bi_bootflags; /* boot / reboot flag (Unused) */ unsigned long bi_ip_addr; /* IP Address */ unsigned char bi_enetaddr[6]; /* OLD: see README.enetaddr */ unsigned short bi_ethspeed; /* Ethernet speed in Mbps */ diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index 529f719..46d29c8 100644 --- a/arch/powerpc/lib/board.c +++ b/arch/powerpc/lib/board.c @@ -546,8 +546,6 @@ void board_init_f (ulong bootflag) } #endif
- bd->bi_bootflags = bootflag; /* boot / reboot flag (for LynxOS) */ - WATCHDOG_RESET (); bd->bi_intfreq = gd->cpu_clk; /* Internal Freq, in Hz */ bd->bi_busfreq = gd->bus_clk; /* Bus Freq, in Hz */ diff --git a/board/fads/fads.h b/board/fads/fads.h index 4ab4b26..2b59d5f 100644 --- a/board/fads/fads.h +++ b/board/fads/fads.h @@ -351,14 +351,6 @@ #define CONFIG_SYS_OR1_PRELIM 0xFFFF8110 /* 64Kbyte address space */ #define CONFIG_SYS_BR1_PRELIM ((BCSR_ADDR) | BR_V)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* values according to the manual */
#define BCSR0 ((uint) (BCSR_ADDR + 0x00)) diff --git a/include/configs/A3000.h b/include/configs/A3000.h index 6d8870c..4657835 100644 --- a/include/configs/A3000.h +++ b/include/configs/A3000.h @@ -310,12 +310,4 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/ADCIOP.h b/include/configs/ADCIOP.h index d8303f3..e8f3fc8 100644 --- a/include/configs/ADCIOP.h +++ b/include/configs/ADCIOP.h @@ -200,13 +200,4 @@ #define FLASH_BASE0_PRELIM 0xFFC00000 /* FLASH bank #0 */ #define FLASH_BASE1_PRELIM 0xFFE00000 /* FLASH bank #1 */
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/AMX860.h b/include/configs/AMX860.h index 6e2907e..10131b7 100644 --- a/include/configs/AMX860.h +++ b/include/configs/AMX860.h @@ -297,12 +297,4 @@ #define CONFIG_SYS_OR6_PRELIM 0xFFFF8000 /* 32kB, 15 waits, cs after addr, no bursts */ #define CONFIG_SYS_BR6_PRELIM 0x60000401 /* use GPCM for CS generation, 8 bit port */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h index e707075..836f217 100644 --- a/include/configs/AP1000.h +++ b/include/configs/AP1000.h @@ -213,14 +213,6 @@ */ #define SPD_EEPROM_ADDRESS 0x50
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/APC405.h b/include/configs/APC405.h index cb3f80b..b2b698c 100644 --- a/include/configs/APC405.h +++ b/include/configs/APC405.h @@ -429,14 +429,6 @@ #endif
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * PCI OHCI controller */ #define CONFIG_USB_OHCI_NEW 1 diff --git a/include/configs/AR405.h b/include/configs/AR405.h index 568ce15..86b0eb8 100644 --- a/include/configs/AR405.h +++ b/include/configs/AR405.h @@ -269,12 +269,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/ASH405.h b/include/configs/ASH405.h index 789f750..bddb480 100644 --- a/include/configs/ASH405.h +++ b/include/configs/ASH405.h @@ -351,14 +351,6 @@ #define CONFIG_SYS_DUART_RST (0x80000000 >> 14)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Default speed selection (cpu_plb_opb_ebc) in mhz. * This value will be set if iic boot eprom is disabled. */ diff --git a/include/configs/ATUM8548.h b/include/configs/ATUM8548.h index 58f0c1f..1da9824 100644 --- a/include/configs/ATUM8548.h +++ b/include/configs/ATUM8548.h @@ -378,14 +378,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/Adder.h b/include/configs/Adder.h index e4d30a1..2b3aa15 100644 --- a/include/configs/Adder.h +++ b/include/configs/Adder.h @@ -207,14 +207,6 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16 /* For all MPC8xx chips */
-/*----------------------------------------------------------------------- - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from flash */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* pass open firmware flat tree */ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h index 85b68be..f3afc86 100644 --- a/include/configs/Alaska8220.h +++ b/include/configs/Alaska8220.h @@ -39,9 +39,6 @@ #define CONFIG_SYS_MPC8220_CLKIN 30000000/* ... running at 30MHz */ #define CONFIG_SYS_MPC8220_SYSPLL_VCO_MULTIPLIER 16 /* VCO multiplier can't be read from any register */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* * Serial console configuration */ diff --git a/include/configs/BAB7xx.h b/include/configs/BAB7xx.h index 555145e..b5c0de6 100644 --- a/include/configs/BAB7xx.h +++ b/include/configs/BAB7xx.h @@ -466,15 +466,6 @@ extern unsigned long bab7xx_get_gclk_freq (void);
#define CONFIG_SYS_L2_BAB7xx
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - #define CONFIG_NET_MULTI /* Multi ethernet cards support */ #define CONFIG_TULIP #define CONFIG_TULIP_SELECT_MEDIA diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h index 44befe9..2c6ee8f 100644 --- a/include/configs/BC3450.h +++ b/include/configs/BC3450.h @@ -58,9 +58,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/BMW.h b/include/configs/BMW.h index 98f6396..53a38fb 100644 --- a/include/configs/BMW.h +++ b/include/configs/BMW.h @@ -300,13 +300,4 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - #endif /* __CONFIG_H */ diff --git a/include/configs/CANBT.h b/include/configs/CANBT.h index ad075b8..30e1315 100644 --- a/include/configs/CANBT.h +++ b/include/configs/CANBT.h @@ -226,13 +226,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h index 764f71b..67c8a09 100644 --- a/include/configs/CATcenter.h +++ b/include/configs/CATcenter.h @@ -540,15 +540,6 @@ #define CONFIG_SYS_GPIO0_TSRH 0x00000000 #define CONFIG_SYS_GPIO0_TCR 0xF7FF8014
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - #define CONFIG_NO_SERIAL_EEPROM
/*--------------------------------------------------------------------*/ diff --git a/include/configs/CMS700.h b/include/configs/CMS700.h index 9c57acb..debc959 100644 --- a/include/configs/CMS700.h +++ b/include/configs/CMS700.h @@ -318,14 +318,6 @@ #define CONFIG_SYS_PLD_RESET (0x80000000 >> 12) /* GPIO12 */
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Default speed selection (cpu_plb_opb_ebc) in mhz. * This value will be set if iic boot eprom is disabled. */ diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h index 6451263..f56c702 100644 --- a/include/configs/CPC45.h +++ b/include/configs/CPC45.h @@ -338,16 +338,6 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - - /*----------------------------------------------------------------------*/ /* CPC45 Memory Map */ /*----------------------------------------------------------------------*/ diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index c6882fd..c646692 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -270,12 +270,4 @@ #define CONFIG_SYS_PB_LED (0x80000000 >> 16) /* GPIO16 */ #define CONFIG_SYS_INTA_FAKE (0x80000000 >> 23) /* GPIO23 */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h index da57b04..d74c3b3 100644 --- a/include/configs/CPCI405.h +++ b/include/configs/CPCI405.h @@ -338,13 +338,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index d682d37..c703a4c 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -399,13 +399,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/CPCI405AB.h b/include/configs/CPCI405AB.h index 1c521f2..ca07e1d 100644 --- a/include/configs/CPCI405AB.h +++ b/include/configs/CPCI405AB.h @@ -391,13 +391,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h index c7b7931..0363742 100644 --- a/include/configs/CPCI405DT.h +++ b/include/configs/CPCI405DT.h @@ -394,12 +394,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h index f2d51f7..d4f2540 100644 --- a/include/configs/CPCI750.h +++ b/include/configs/CPCI750.h @@ -616,14 +616,6 @@
#define L2_ENABLE (L2_INIT | L2CR_L2E)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_BOARD_ASM_INIT 1
#define CPCI750_SLAVE_TEST (((in8(0xf0300000) & 0x80) == 0) ? 0 : 1) diff --git a/include/configs/CPCIISER4.h b/include/configs/CPCIISER4.h index f114290..9eb1edc 100644 --- a/include/configs/CPCIISER4.h +++ b/include/configs/CPCIISER4.h @@ -252,12 +252,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/CPU86.h b/include/configs/CPU86.h index 6d76d9f..fea7ba4 100644 --- a/include/configs/CPU86.h +++ b/include/configs/CPU86.h @@ -333,15 +333,6 @@ #define CONFIG_ENV_SIZE (2048 - 512) #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*----------------------------------------------------------------------- * Cache Configuration */ diff --git a/include/configs/CPU87.h b/include/configs/CPU87.h index 83b010c..4b9b8e6 100644 --- a/include/configs/CPU87.h +++ b/include/configs/CPU87.h @@ -354,15 +354,6 @@ #define CONFIG_ENV_SIZE (2048 - 512) #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*----------------------------------------------------------------------- * Cache Configuration */ diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h index f6cd760..b524b96 100644 --- a/include/configs/CRAYL1.h +++ b/include/configs/CRAYL1.h @@ -241,12 +241,4 @@ #define EEPROM_WRITE_ADDRESS 0xA0 #define EEPROM_READ_ADDRESS 0xA1
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/CU824.h b/include/configs/CU824.h index 4a3f2bc..894ecf1 100644 --- a/include/configs/CU824.h +++ b/include/configs/CU824.h @@ -290,14 +290,6 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /*----------------------------------------------------------------------- * PCI stuff *----------------------------------------------------------------------- diff --git a/include/configs/DASA_SIM.h b/include/configs/DASA_SIM.h index 21230e1..bb286eb 100644 --- a/include/configs/DASA_SIM.h +++ b/include/configs/DASA_SIM.h @@ -190,13 +190,4 @@
#define FLASH_BASE0_PRELIM 0xFFE00000 /* FLASH bank #0 */
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h index 910933a..c30537a 100644 --- a/include/configs/DB64360.h +++ b/include/configs/DB64360.h @@ -593,14 +593,6 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
#define L2_ENABLE (L2_INIT | L2CR_L2E)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_BOARD_ASM_INIT 1
#endif /* __CONFIG_H */ diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h index 765eaaf..a7d7cab 100644 --- a/include/configs/DB64460.h +++ b/include/configs/DB64460.h @@ -531,14 +531,6 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
#define L2_ENABLE (L2_INIT | L2CR_L2E)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_BOARD_ASM_INIT 1
#endif /* __CONFIG_H */ diff --git a/include/configs/DP405.h b/include/configs/DP405.h index 5311dfb..902494d 100644 --- a/include/configs/DP405.h +++ b/include/configs/DP405.h @@ -257,14 +257,6 @@ #define CONFIG_SYS_GPIO0_TCR 0xB7FE0014 /* 0 ... 31 */
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Default speed selection (cpu_plb_opb_ebc) in mhz. * This value will be set if iic boot eprom is disabled. */ diff --git a/include/configs/DU405.h b/include/configs/DU405.h index 6ba9f13..6bb7652 100644 --- a/include/configs/DU405.h +++ b/include/configs/DU405.h @@ -289,13 +289,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/DU440.h b/include/configs/DU440.h index 9c34994..955827b 100644 --- a/include/configs/DU440.h +++ b/include/configs/DU440.h @@ -417,14 +417,6 @@ int du440_phy_addr(int devnum); #define CONFIG_SYS_NAND_BASE_LIST {CONFIG_SYS_NAND0_ADDR + CONFIG_SYS_NAND0_CS, \ CONFIG_SYS_NAND1_ADDR + CONFIG_SYS_NAND1_CS}
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/ELPPC.h b/include/configs/ELPPC.h index 84d27b6..22f6377 100644 --- a/include/configs/ELPPC.h +++ b/include/configs/ELPPC.h @@ -347,14 +347,6 @@ #endif #define L2_ENABLE (L2_INIT | L2CR_L2E)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_NET_MULTI /* Multi ethernet cards support */ #define CONFIG_EEPRO100 #define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ diff --git a/include/configs/ELPT860.h b/include/configs/ELPT860.h index 0f56302..17fb520 100644 --- a/include/configs/ELPT860.h +++ b/include/configs/ELPT860.h @@ -386,17 +386,4 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
-/*----------------------------------------------------------------------- - * Internal Definitions - *----------------------------------------------------------------------- - * - */ - -/* - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - #endif /* __CONFIG_H */ diff --git a/include/configs/EP88x.h b/include/configs/EP88x.h index e1c6096..9a07b98 100644 --- a/include/configs/EP88x.h +++ b/include/configs/EP88x.h @@ -205,12 +205,4 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16 /* For all MPC8xx chips */
-/*----------------------------------------------------------------------- - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from flash */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/ERIC.h b/include/configs/ERIC.h index da3b4ae..6c372d2 100644 --- a/include/configs/ERIC.h +++ b/include/configs/ERIC.h @@ -361,14 +361,6 @@ */ #define SPD_EEPROM_ADDRESS 0x50
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/ESTEEM192E.h b/include/configs/ESTEEM192E.h index 11a862e..eee9480 100644 --- a/include/configs/ESTEEM192E.h +++ b/include/configs/ESTEEM192E.h @@ -310,22 +310,4 @@ #define CONFIG_SYS_MAMR_8COL 0x18803112 #define CONFIG_SYS_MAMR_9COL 0x18803112 /* same as 8 column because its just easier to port with*/
- -/* - * Internal Definitions - * - * Boot Flags - */ - -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/ETX094.h b/include/configs/ETX094.h index c36f2bb..a490ed7 100644 --- a/include/configs/ETX094.h +++ b/include/configs/ETX094.h @@ -355,13 +355,4 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_1X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/EVB64260.h b/include/configs/EVB64260.h index 0903536..5b592f1 100644 --- a/include/configs/EVB64260.h +++ b/include/configs/EVB64260.h @@ -419,14 +419,6 @@
#define L2_ENABLE (L2_INIT | L2CR_L2E)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_BOARD_ASM_INIT 1
diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h index 4d08243..9c6d99b 100644 --- a/include/configs/EXBITGEN.h +++ b/include/configs/EXBITGEN.h @@ -205,14 +205,6 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/FADS823.h b/include/configs/FADS823.h index cb75960..937ced9 100644 --- a/include/configs/FADS823.h +++ b/include/configs/FADS823.h @@ -341,13 +341,6 @@ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
#define CONFIG_SYS_MAMR 0x13a01114 -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */
/* values according to the manual */
diff --git a/include/configs/FADS850SAR.h b/include/configs/FADS850SAR.h index 84187fb..989066f 100644 --- a/include/configs/FADS850SAR.h +++ b/include/configs/FADS850SAR.h @@ -295,14 +295,6 @@ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
#define CONFIG_SYS_MAMR 0x13a01114 -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ -
/* values according to the manual */
diff --git a/include/configs/FLAGADM.h b/include/configs/FLAGADM.h index 0f4277c..07651e6 100644 --- a/include/configs/FLAGADM.h +++ b/include/configs/FLAGADM.h @@ -312,12 +312,4 @@ #define CONFIG_SYS_OR4 ( OR_AM_MSK | OR_CSNT_SAM | OR_BI | OR_G5LS) #define CONFIG_SYS_BR4 ( (DSP_BASE & BR_BA_MSK) | BR_PS_16 | BR_MS_UPMB | BR_V )
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h index addca2f..7c21149 100644 --- a/include/configs/FPS850L.h +++ b/include/configs/FPS850L.h @@ -428,15 +428,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* pass open firmware flat tree */ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h index ec9000d..0b7853f 100644 --- a/include/configs/FPS860L.h +++ b/include/configs/FPS860L.h @@ -428,15 +428,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SCC1_ENET
/* pass open firmware flat tree */ diff --git a/include/configs/G2000.h b/include/configs/G2000.h index e2e6cb2..9d3369d 100644 --- a/include/configs/G2000.h +++ b/include/configs/G2000.h @@ -381,14 +381,6 @@ #define CONFIG_SYS_GPIO0_TCR 0xF7FF8014
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Default speed selection (cpu_plb_opb_ebc) in mhz. * This value will be set if iic boot eprom is disabled. */ diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h index 12f879a..a44ae66 100644 --- a/include/configs/GEN860T.h +++ b/include/configs/GEN860T.h @@ -725,12 +725,6 @@ )
/* - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * FEC interrupt assignment */ #define FEC_INTERRUPT SIU_LEVEL1 diff --git a/include/configs/GENIETV.h b/include/configs/GENIETV.h index fadd830..e2207ac 100644 --- a/include/configs/GENIETV.h +++ b/include/configs/GENIETV.h @@ -331,14 +331,6 @@ MAMR_G0CLA_A11 | MAMR_RLFA_1X | MAMR_WLFA_1X \ | MAMR_TLFA_4X) /* 0x5d802114 */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* values according to the manual */
#define CONFIG_DRAM_50MHZ 1 diff --git a/include/configs/HH405.h b/include/configs/HH405.h index 0db9298..905b807 100644 --- a/include/configs/HH405.h +++ b/include/configs/HH405.h @@ -481,14 +481,6 @@ #define CONFIG_SYS_LCD1_RST (0x80000000 >> 31)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Default speed selection (cpu_plb_opb_ebc) in mhz. * This value will be set if iic boot eprom is disabled. */ diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h index 251fe67..d03cf9b 100644 --- a/include/configs/HIDDEN_DRAGON.h +++ b/include/configs/HIDDEN_DRAGON.h @@ -376,14 +376,6 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* values according to the manual */ #define CONFIG_DRAM_50MHZ 1 #define CONFIG_SDRAM_50MHZ diff --git a/include/configs/HUB405.h b/include/configs/HUB405.h index 5dea96e..e5e05ae 100644 --- a/include/configs/HUB405.h +++ b/include/configs/HUB405.h @@ -354,14 +354,6 @@ #define CONFIG_SYS_UART5_RS232 (0x80000000 >> 8)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Default speed selection (cpu_plb_opb_ebc) in mhz. * This value will be set if iic boot eprom is disabled. */ diff --git a/include/configs/IAD210.h b/include/configs/IAD210.h index ea1e706..a2743f2 100644 --- a/include/configs/IAD210.h +++ b/include/configs/IAD210.h @@ -370,15 +370,6 @@ MAMR_AMA_TYPE_0 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A11 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_8X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #ifdef CONFIG_MPC860T
/* Interrupt level assignments. diff --git a/include/configs/ICU862.h b/include/configs/ICU862.h index 917135e..fbab011 100644 --- a/include/configs/ICU862.h +++ b/include/configs/ICU862.h @@ -448,13 +448,6 @@ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
#define CONFIG_SYS_MAMR 0x13a01114 -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */
#ifdef CONFIG_MPC860T
diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h index 4e73941..ea52c98 100644 --- a/include/configs/IDS8247.h +++ b/include/configs/IDS8247.h @@ -309,15 +309,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc()*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*----------------------------------------------------------------------- * Cache Configuration */ diff --git a/include/configs/IP860.h b/include/configs/IP860.h index ed6b7fd..31e0cd1 100644 --- a/include/configs/IP860.h +++ b/include/configs/IP860.h @@ -455,18 +455,4 @@ typedef struct ip860_bcsr_s { #define BD_CTRL_FLWE 0x20 /* Flash Write Enable */ #define BD_CTRL_RWDN 0x10 /* VMEBus Requester Release When Done Enable */
-/*----------------------------------------------------------------------- - * - *----------------------------------------------------------------------- - * - */ - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/IPHASE4539.h b/include/configs/IPHASE4539.h index 3cb6cf7..cbc25e6 100644 --- a/include/configs/IPHASE4539.h +++ b/include/configs/IPHASE4539.h @@ -250,15 +250,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
/*----------------------------------------------------------------------- - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - -/*----------------------------------------------------------------------- * Cache Configuration */ #define CONFIG_SYS_CACHELINE_SIZE 32 /* For MPC8260 CPU */ diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h index c0b1d86..b25a8d9 100644 --- a/include/configs/ISPAN.h +++ b/include/configs/ISPAN.h @@ -235,14 +235,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
/*----------------------------------------------------------------------- - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from flash */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/*----------------------------------------------------------------------- * Cache Configuration */ #define CONFIG_SYS_CACHELINE_SIZE 32 /* For MPC8260 CPU */ diff --git a/include/configs/IVML24.h b/include/configs/IVML24.h index 1a4924e..f50fd9c 100644 --- a/include/configs/IVML24.h +++ b/include/configs/IVML24.h @@ -473,13 +473,4 @@ MBMR_AMB_TYPE_1 | MBMR_DSB_1_CYCL | MBMR_G0CLB_A10 | \ MBMR_RLFB_1X | MBMR_WLFB_1X | MBMR_TLFB_4X) #endif - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/IVMS8.h b/include/configs/IVMS8.h index 256cabd..b5774d6 100644 --- a/include/configs/IVMS8.h +++ b/include/configs/IVMS8.h @@ -456,13 +456,4 @@ MBMR_RLFB_1X | MBMR_WLFB_1X | MBMR_TLFB_4X)
#endif - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h index 3961100..4923cc6 100644 --- a/include/configs/IceCube.h +++ b/include/configs/IceCube.h @@ -35,9 +35,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/JSE.h b/include/configs/JSE.h index b0b1175..dfb75e4 100644 --- a/include/configs/JSE.h +++ b/include/configs/JSE.h @@ -293,15 +293,6 @@ /* Configuration Port location */ #define CONFIG_PORT_ADDR 0xF0000500
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h index 94cc317..f560849 100644 --- a/include/configs/KAREF.h +++ b/include/configs/KAREF.h @@ -286,14 +286,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal PowerOn: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* kgdb serial port baud */ #define CONFIG_KGDB_SER_INDEX 2 /* kgdb serial port */ diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h index c6978c3..e5133ef 100644 --- a/include/configs/KUP4K.h +++ b/include/configs/KUP4K.h @@ -495,15 +495,6 @@
#define LATCH_ADDR 0x90000200
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - #define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */ #define CONFIG_AUTOBOOT_STOP_STR "." #define CONFIG_SILENT_CONSOLE 1 diff --git a/include/configs/KUP4X.h b/include/configs/KUP4X.h index ab535e1..11bd245 100644 --- a/include/configs/KUP4X.h +++ b/include/configs/KUP4X.h @@ -446,15 +446,6 @@
#define LATCH_ADDR 0x90000200
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - #define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */
#define CONFIG_AUTOBOOT_STOP_STR "." /* easy to stop for now */ diff --git a/include/configs/LANTEC.h b/include/configs/LANTEC.h index 6e8a4b8..0a06aa1 100644 --- a/include/configs/LANTEC.h +++ b/include/configs/LANTEC.h @@ -340,14 +340,6 @@ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * JFFS2 partitions * */ diff --git a/include/configs/MBX.h b/include/configs/MBX.h index 5f7c7a8..32a953e 100644 --- a/include/configs/MBX.h +++ b/include/configs/MBX.h @@ -310,12 +310,4 @@ */ #define CONFIG_SYS_DER 0
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/MBX860T.h b/include/configs/MBX860T.h index afe2383..6a9991c 100644 --- a/include/configs/MBX860T.h +++ b/include/configs/MBX860T.h @@ -282,14 +282,6 @@ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
#define CONFIG_SYS_MAMR 0x13821000 -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ -
/* values according to the manual */
diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h index 2e63306..1fabba6 100644 --- a/include/configs/METROBOX.h +++ b/include/configs/METROBOX.h @@ -351,14 +351,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal PowerOn: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* kgdb serial port baud */ #define CONFIG_KGDB_SER_INDEX 2 /* kgdb serial port */ diff --git a/include/configs/MHPC.h b/include/configs/MHPC.h index 19a288c..96785e1 100644 --- a/include/configs/MHPC.h +++ b/include/configs/MHPC.h @@ -386,12 +386,4 @@ */ #define CONFIG_SYS_DER 0
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index bfff750..b6de4b0 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -315,15 +315,6 @@ #define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 12) #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*********************************************************************** * External peripheral base address ***********************************************************************/ diff --git a/include/configs/ML2.h b/include/configs/ML2.h index 2fc0119..17ccaba 100644 --- a/include/configs/ML2.h +++ b/include/configs/ML2.h @@ -221,14 +221,6 @@ */ #define SPD_EEPROM_ADDRESS 0x50
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MOUSSE.h b/include/configs/MOUSSE.h index 986590a..17dc493 100644 --- a/include/configs/MOUSSE.h +++ b/include/configs/MOUSSE.h @@ -312,15 +312,6 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* Localizations */ #if 0 #define CONFIG_ETHADDR 0:0:0:0:1:d diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h index ffd37fd..9c7466a 100644 --- a/include/configs/MPC8260ADS.h +++ b/include/configs/MPC8260ADS.h @@ -373,9 +373,6 @@ #define CONFIG_SYS_HRCW_SLAVE6 0 #define CONFIG_SYS_HRCW_SLAVE7 0
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_MONITOR_BASE TEXT_BASE #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) # define CONFIG_SYS_RAMBOOT diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h index 55d77f8..dd7ca12 100644 --- a/include/configs/MPC8266ADS.h +++ b/include/configs/MPC8266ADS.h @@ -419,9 +419,6 @@ #define CONFIG_SYS_HRCW_SLAVE6 0 #define CONFIG_SYS_HRCW_SLAVE7 0
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_MONITOR_BASE TEXT_BASE #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) # define CONFIG_SYS_RAMBOOT diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 1314271..a90050d 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -496,14 +496,6 @@ #define CONFIG_SYS_DBAT3U CONFIG_SYS_IBAT3U
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Environment Configuration */
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 3fdd1b0..a287b97 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -577,14 +577,6 @@ #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Environment Configuration */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index abc29c0..ad98aa9 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -604,14 +604,6 @@ #define CONFIG_SYS_DBAT7L CONFIG_SYS_IBAT7L #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 0719fce..2c54754 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -507,14 +507,6 @@ #define CONFIG_SYS_DBAT7L CONFIG_SYS_IBAT7L #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if (CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index bed62bd..8ac4544 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -526,14 +526,6 @@ #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 55e9de0..8f9e300 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -667,14 +667,6 @@ #define CONFIG_SYS_DBAT7L CONFIG_SYS_IBAT7L #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 117f745..21e5b5e 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -660,14 +660,6 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CONFIG_SYS_DBAT7L CONFIG_SYS_IBAT7L #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h index d7381aa..51e6626 100644 --- a/include/configs/MPC8360EMDS.h +++ b/include/configs/MPC8360EMDS.h @@ -567,14 +567,6 @@ #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h index fc53ecc..24ee326 100644 --- a/include/configs/MPC8360ERDK.h +++ b/include/configs/MPC8360ERDK.h @@ -484,14 +484,6 @@ #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U #endif /* CONFIG_PCI */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 8546ebc..9f0f626 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -618,14 +618,6 @@ extern int board_pci_host_broken(void); #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 20c2304..724f4ea 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -627,14 +627,6 @@ #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 0a9f47b..8ae48ac 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -707,14 +707,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index c133895..aa44e56 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -420,14 +420,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8540EVAL.h b/include/configs/MPC8540EVAL.h index 75227a6..d80993f 100644 --- a/include/configs/MPC8540EVAL.h +++ b/include/configs/MPC8540EVAL.h @@ -330,14 +330,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index c3167e9..c12d4d9 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -436,14 +436,6 @@ extern unsigned long get_clock_freq(void); */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 1804582..6d8b4c3 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -451,14 +451,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index e1e4acf..efafdc0 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -491,14 +491,6 @@ extern unsigned long get_clock_freq(void); */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index b0dd175..bb3062d 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -434,14 +434,6 @@ extern unsigned long get_clock_freq(void); */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 31740fd..12b2f12 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -461,14 +461,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index a98ecde..42c76df 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -451,14 +451,6 @@ extern unsigned long get_clock_freq(void); */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index 95c0a9f..cf39884 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -585,14 +585,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 34ebbdb..fab1657 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -601,14 +601,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 2b7b8b5..c91c79c 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -520,14 +520,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index d92b12d..0a3dcb1 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -675,14 +675,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/MUSENKI.h b/include/configs/MUSENKI.h index ec9e1ec..b8b89d7 100644 --- a/include/configs/MUSENKI.h +++ b/include/configs/MUSENKI.h @@ -293,12 +293,4 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h index 8f6b16b..b8d3993 100644 --- a/include/configs/MVBC_P.h +++ b/include/configs/MVBC_P.h @@ -34,9 +34,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000
-#define BOOTFLAG_COLD 0x01 -#define BOOTFLAG_WARM 0x02 - #define CONFIG_MISC_INIT_R 1
#define CONFIG_SYS_CACHELINE_SIZE 32 diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h index 25d8077..1a4b184 100644 --- a/include/configs/MVBLM7.h +++ b/include/configs/MVBLM7.h @@ -379,15 +379,6 @@ #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - -/* * Environment Configuration */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/MVBLUE.h b/include/configs/MVBLUE.h index 669816c..e9ac4a0 100644 --- a/include/configs/MVBLUE.h +++ b/include/configs/MVBLUE.h @@ -340,13 +340,4 @@ #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/MVS1.h b/include/configs/MVS1.h index 10210f0..9bf7fcb 100644 --- a/include/configs/MVS1.h +++ b/include/configs/MVS1.h @@ -406,13 +406,4 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A7 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/MVSMR.h b/include/configs/MVSMR.h index 000c4c6..43aed86 100644 --- a/include/configs/MVSMR.h +++ b/include/configs/MVSMR.h @@ -34,9 +34,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000
-#define BOOTFLAG_COLD 0x01 -#define BOOTFLAG_WARM 0x02 - #define CONFIG_MISC_INIT_R 1
#define CONFIG_SYS_CACHELINE_SIZE 32 diff --git a/include/configs/NC650.h b/include/configs/NC650.h index 6343cfe..c82dfe6 100644 --- a/include/configs/NC650.h +++ b/include/configs/NC650.h @@ -424,14 +424,6 @@
#define CONFIG_SYS_MBMR_NAND ( MBMR_WLFB_5X )
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_JFFS2_NAND 1 /* jffs2 on nand support */ #define NAND_CACHE_PAGES 16 /* size of nand cache in 512 bytes pages */
diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h index 76ca916..d618312 100644 --- a/include/configs/NETPHONE.h +++ b/include/configs/NETPHONE.h @@ -478,14 +478,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_LAST_STAGE_INIT /* needed to reset the damn phys */
/****************************************************************/ diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h index 4f9f9fe..dc16fda 100644 --- a/include/configs/NETTA.h +++ b/include/configs/NETTA.h @@ -487,14 +487,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_LAST_STAGE_INIT /* needed to reset the damn phys */
/*********************************************************************************************************** diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h index d060cb7..eadde26 100644 --- a/include/configs/NETTA2.h +++ b/include/configs/NETTA2.h @@ -479,14 +479,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_LAST_STAGE_INIT /* needed to reset the damn phys */
/****************************************************************/ diff --git a/include/configs/NETVIA.h b/include/configs/NETVIA.h index a18b480..49a0309 100644 --- a/include/configs/NETVIA.h +++ b/include/configs/NETVIA.h @@ -346,14 +346,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* Ethernet at SCC2 */ #define CONFIG_SCC2_ENET
diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h index 6a4c47d..391cf81 100644 --- a/include/configs/NSCU.h +++ b/include/configs/NSCU.h @@ -474,15 +474,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #undef CONFIG_SCC1_ENET #define CONFIG_FEC_ENET
diff --git a/include/configs/NX823.h b/include/configs/NX823.h index 5054d5e..6683ac8 100644 --- a/include/configs/NX823.h +++ b/include/configs/NX823.h @@ -356,15 +356,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_ENV_OVERWRITE /* allow changes to ethaddr (for now) */ #define CONFIG_ETHADDR 00:10:20:30:40:50 #define CONFIG_IPADDR 10.77.77.20 diff --git a/include/configs/OCRTC.h b/include/configs/OCRTC.h index ad2e4da..cfe9e72 100644 --- a/include/configs/OCRTC.h +++ b/include/configs/OCRTC.h @@ -300,13 +300,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/ORSG.h b/include/configs/ORSG.h index 3d35362..cef1117 100644 --- a/include/configs/ORSG.h +++ b/include/configs/ORSG.h @@ -298,13 +298,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/OXC.h b/include/configs/OXC.h index 74c51f4..36ccde0 100644 --- a/include/configs/OXC.h +++ b/include/configs/OXC.h @@ -314,13 +314,4 @@ #if defined(CONFIG_CMD_KGDB) # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index da826fc..34e0ea5 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -397,14 +397,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #ifdef CONFIG_CMD_KGDB #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h index fa45b5b..1391e9f 100644 --- a/include/configs/P1_P2_RDB.h +++ b/include/configs/P1_P2_RDB.h @@ -538,14 +538,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20)/* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h index 74cff0c..9e0cab7 100644 --- a/include/configs/P2020DS.h +++ b/include/configs/P2020DS.h @@ -605,14 +605,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/P3G4.h b/include/configs/P3G4.h index 890170d..0508e62 100644 --- a/include/configs/P3G4.h +++ b/include/configs/P3G4.h @@ -421,14 +421,6 @@
#define L2_ENABLE (L2_INIT | L2CR_L2E)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_BOARD_ASM_INIT 1
diff --git a/include/configs/PATI.h b/include/configs/PATI.h index 88e9528..12483a0 100644 --- a/include/configs/PATI.h +++ b/include/configs/PATI.h @@ -283,16 +283,6 @@ */ #define CONFIG_SYS_DER 0x00000000
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - #define VERSION_TAG "released" #define CONFIG_ISO_STRING "MEV-10084-001"
diff --git a/include/configs/PCI405.h b/include/configs/PCI405.h index 244d6fe..2954f52 100644 --- a/include/configs/PCI405.h +++ b/include/configs/PCI405.h @@ -311,12 +311,4 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/PCIPPC2.h b/include/configs/PCIPPC2.h index c30ac78..05d152d 100644 --- a/include/configs/PCIPPC2.h +++ b/include/configs/PCIPPC2.h @@ -238,14 +238,6 @@ L2CR_L2OH_5 | L2CR_L2CTL | L2CR_L2WT) #define L2_ENABLE (L2_INIT | L2CR_L2E)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /*----------------------------------------------------------------------- RTC m48t59 */ diff --git a/include/configs/PCIPPC6.h b/include/configs/PCIPPC6.h index bc67480..1c28e80 100644 --- a/include/configs/PCIPPC6.h +++ b/include/configs/PCIPPC6.h @@ -240,14 +240,6 @@ L2CR_L2OH_5 | L2CR_L2CTL | L2CR_L2WT) #define L2_ENABLE (L2_INIT | L2CR_L2E)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /*----------------------------------------------------------------------- RTC m48t59 */ diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 2901cfd..c72e26c 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -260,15 +260,6 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*********************************************************************** * External peripheral base address ***********************************************************************/ diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index 928ed8e..8d4da20 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -396,14 +396,6 @@ #define CONFIG_SYS_EEPROM_WP (0x80000000 >> 0)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Default speed selection (cpu_plb_opb_ebc) in MHz. * This value will be set if iic boot eprom is disabled. */ diff --git a/include/configs/PM520.h b/include/configs/PM520.h index 22de207..ce73e40 100644 --- a/include/configs/PM520.h +++ b/include/configs/PM520.h @@ -37,9 +37,6 @@
#define CONFIG_MISC_INIT_R
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/PM826.h b/include/configs/PM826.h index 636bd26..4842416 100644 --- a/include/configs/PM826.h +++ b/include/configs/PM826.h @@ -318,15 +318,6 @@ #define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*----------------------------------------------------------------------- * Cache Configuration */ diff --git a/include/configs/PM828.h b/include/configs/PM828.h index 9d620af..d23affd 100644 --- a/include/configs/PM828.h +++ b/include/configs/PM828.h @@ -312,15 +312,6 @@ #define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*----------------------------------------------------------------------- * Cache Configuration */ diff --git a/include/configs/PM854.h b/include/configs/PM854.h index cf8a8cf..8654ff4 100644 --- a/include/configs/PM854.h +++ b/include/configs/PM854.h @@ -365,14 +365,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/PM856.h b/include/configs/PM856.h index 0bd28fc..1850a57 100644 --- a/include/configs/PM856.h +++ b/include/configs/PM856.h @@ -365,14 +365,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/PMC405.h b/include/configs/PMC405.h index c420efe..078e671 100644 --- a/include/configs/PMC405.h +++ b/include/configs/PMC405.h @@ -334,14 +334,6 @@ CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_OF_LIBFDT #define CONFIG_OF_BOARD_SETUP
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index bf2247d..fcf3631 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -503,14 +503,6 @@ #define CONFIG_SYS_NAND_SELECT_DEVICE 1 /* nand driver supports mutipl. chips */ #define CONFIG_SYS_NAND_QUIET_TEST 1
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/PN62.h b/include/configs/PN62.h index 562c5c3..f32322f 100644 --- a/include/configs/PN62.h +++ b/include/configs/PN62.h @@ -301,14 +301,4 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - #endif /* __CONFIG_H */ diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h index f9b2014..ed60c64 100644 --- a/include/configs/PPChameleonEVB.h +++ b/include/configs/PPChameleonEVB.h @@ -557,15 +557,6 @@ #define CONFIG_SYS_GPIO0_TSRH 0x00000000 #define CONFIG_SYS_GPIO0_TCR 0xF7FF8014
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - #define CONFIG_NO_SERIAL_EEPROM
/*--------------------------------------------------------------------*/ diff --git a/include/configs/QS823.h b/include/configs/QS823.h index c1416cb..e938e68 100644 --- a/include/configs/QS823.h +++ b/include/configs/QS823.h @@ -563,14 +563,6 @@ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X) #define CONFIG_SYS_BR7_PRELIM 0xF0700000
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Sanity checks */ #if defined(CONFIG_SCC1_ENET) && defined(CONFIG_FEC_ENET) diff --git a/include/configs/QS850.h b/include/configs/QS850.h index de74fee..0b1c299 100644 --- a/include/configs/QS850.h +++ b/include/configs/QS850.h @@ -563,14 +563,6 @@ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X) #define CONFIG_SYS_BR7_PRELIM 0xF0700000
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Sanity checks */ #if defined(CONFIG_SCC1_ENET) && defined(CONFIG_FEC_ENET) diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h index 705d375..5f2f668 100644 --- a/include/configs/QS860T.h +++ b/include/configs/QS860T.h @@ -400,15 +400,6 @@ CONFIG_SPI /* #define CONFIG_SYS_OR7 0xFF000000 */ /* #define CONFIG_SYS_BR7 0xE8000000 */
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* * Sanity checks */ diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h index 830f4bc..ddc1232 100644 --- a/include/configs/R360MPI.h +++ b/include/configs/R360MPI.h @@ -475,13 +475,4 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h index 00ac6cf..29ac234 100644 --- a/include/configs/RBC823.h +++ b/include/configs/RBC823.h @@ -406,15 +406,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* * JFFS2 partitions * diff --git a/include/configs/RPXClassic.h b/include/configs/RPXClassic.h index bec5278..06ff979 100644 --- a/include/configs/RPXClassic.h +++ b/include/configs/RPXClassic.h @@ -442,15 +442,6 @@ MAMR_AMA_TYPE_2 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A12 | \ MAMR_GPL_A4DIS | MAMR_RLFA_4X | MAMR_WLFA_3X | MAMR_TLFA_16X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ /* Configuration variable added by yooth. */ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ diff --git a/include/configs/RPXlite.h b/include/configs/RPXlite.h index dd9134d..6013378 100644 --- a/include/configs/RPXlite.h +++ b/include/configs/RPXlite.h @@ -335,15 +335,6 @@ MAMR_AMA_TYPE_2 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A12 | \ MAMR_GPL_A4DIS | MAMR_RLFA_4X | MAMR_WLFA_3X | MAMR_TLFA_16X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ /* Configuration variable added by yooth. */ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h index a59053c..dd6429c 100644 --- a/include/configs/RPXlite_DW.h +++ b/include/configs/RPXlite_DW.h @@ -414,14 +414,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10) /* CONFIG_SYS_MAMR_9COL:0x20904000 @ 64MHz */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ /* Configuration variable added by yooth. */ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ diff --git a/include/configs/RPXsuper.h b/include/configs/RPXsuper.h index da962f3..84aa7e2 100644 --- a/include/configs/RPXsuper.h +++ b/include/configs/RPXsuper.h @@ -504,12 +504,4 @@ ORxG_SCY_5_CLK |\ ORxG_TRLX)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/RRvision.h b/include/configs/RRvision.h index 6ec5be0..e75d32f 100644 --- a/include/configs/RRvision.h +++ b/include/configs/RRvision.h @@ -468,12 +468,4 @@ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h index e630afe..4d3ecf2 100644 --- a/include/configs/Rattler.h +++ b/include/configs/Rattler.h @@ -262,9 +262,6 @@ #define CONFIG_SYS_HRCW_SLAVE6 0 #define CONFIG_SYS_HRCW_SLAVE7 0
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_MALLOC_LEN (4096 << 10) /* Reserve 4 MB for malloc() */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h index d6b3cb8..c6bd366 100644 --- a/include/configs/SBC8540.h +++ b/include/configs/SBC8540.h @@ -420,14 +420,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/SCM.h b/include/configs/SCM.h index c6fb074..48375bd 100644 --- a/include/configs/SCM.h +++ b/include/configs/SCM.h @@ -342,15 +342,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc()*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*----------------------------------------------------------------------- * Hardware Information Block */ diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h index 9c8c318..f13321a 100644 --- a/include/configs/SIMPC8313.h +++ b/include/configs/SIMPC8313.h @@ -477,14 +477,6 @@ #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Environment Configuration */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/SM850.h b/include/configs/SM850.h index 56f03e2..e8c10ec 100644 --- a/include/configs/SM850.h +++ b/include/configs/SM850.h @@ -363,15 +363,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* pass open firmware flat tree */ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 diff --git a/include/configs/SPD823TS.h b/include/configs/SPD823TS.h index fa77882..63a7137 100644 --- a/include/configs/SPD823TS.h +++ b/include/configs/SPD823TS.h @@ -417,12 +417,4 @@ MBMR_AMB_TYPE_0 | MBMR_DSB_1_CYCL | MBMR_G0CLB_A11 | \ MBMR_RLFB_1X | MBMR_WLFB_1X | MBMR_TLFB_4X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h index 8ee8cbf..7db9d1b 100644 --- a/include/configs/SXNI855T.h +++ b/include/configs/SXNI855T.h @@ -372,13 +372,6 @@ #define DUART_BR5_VALUE ((CONFIG_SYS_DUARTA_BASE & BR_BA_MSK ) | DUART_BR_VALUE) #define DUART_BR6_VALUE ((CONFIG_SYS_DUARTB_BASE & BR_BA_MSK ) | DUART_BR_VALUE)
-/********************************************************** - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_RESET_ON_PANIC /* reset if system panic() */
#define CONFIG_ENV_IS_IN_FLASH diff --git a/include/configs/Sandpoint8240.h b/include/configs/Sandpoint8240.h index 125b9a2..91b961f 100644 --- a/include/configs/Sandpoint8240.h +++ b/include/configs/Sandpoint8240.h @@ -400,16 +400,6 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /* values according to the manual */
#define CONFIG_DRAM_50MHZ 1 diff --git a/include/configs/Sandpoint8245.h b/include/configs/Sandpoint8245.h index 8cb920e..290969e 100644 --- a/include/configs/Sandpoint8245.h +++ b/include/configs/Sandpoint8245.h @@ -378,16 +378,6 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /* values according to the manual */
#define CONFIG_DRAM_50MHZ 1 diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h index 7a6602c..cb4c05f 100644 --- a/include/configs/TB5200.h +++ b/include/configs/TB5200.h @@ -39,9 +39,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h index 7cefa32..fd1fc02 100644 --- a/include/configs/TK885D.h +++ b/include/configs/TK885D.h @@ -484,14 +484,6 @@ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Network configuration */ #define CONFIG_FEC_ENET /* enable ethernet on FEC */ diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h index 50197f4..4ef5265 100644 --- a/include/configs/TOP5200.h +++ b/include/configs/TOP5200.h @@ -47,9 +47,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/TOP860.h b/include/configs/TOP860.h index b9e450d..1d73474 100644 --- a/include/configs/TOP860.h +++ b/include/configs/TOP860.h @@ -246,14 +246,6 @@ */ #define FEC_INTERRUPT SIU_LEVEL1 /* FEC interrupt */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /*----------------------------------------------------------------------- * Debug Enable Register *----------------------------------------------------------------------- diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index 107bff1..8d4eca3 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -44,9 +44,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index 372c76d..13b9f93 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -481,15 +481,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* pass open firmware flat tree */ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index 64c9707..219ad49 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -477,15 +477,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* pass open firmware flat tree */ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h index 582e670..c51fd19 100644 --- a/include/configs/TQM8260.h +++ b/include/configs/TQM8260.h @@ -379,15 +379,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (512 << 10) /* Reserve 512 kB for malloc()*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /*----------------------------------------------------------------------- * Cache Configuration */ diff --git a/include/configs/TQM8272.h b/include/configs/TQM8272.h index 12a7eda..7d6fb58 100644 --- a/include/configs/TQM8272.h +++ b/include/configs/TQM8272.h @@ -502,14 +502,6 @@ #define CONFIG_SYS_MONITOR_LEN (192 << 10) /* Reserve 192 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc()*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /*----------------------------------------------------------------------- * Cache Configuration */ diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index d0c6a4d..61e532c 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -458,14 +458,6 @@ #define CONFIG_SYS_DBAT7L CONFIG_SYS_IBAT7L #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index bf6ecce..0050feb 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -466,15 +466,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* pass open firmware flat tree */ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index 7442452..5cc815f 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -466,15 +466,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* pass open firmware flat tree */ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index 5bf8f02..4932418 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -470,15 +470,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SCC1_ENET #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index 456ed7e..1039ceb 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -505,15 +505,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SCC1_ENET #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h index ccb339d..c9d4b99 100644 --- a/include/configs/TQM85xx.h +++ b/include/configs/TQM85xx.h @@ -623,14 +623,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port*/ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index 94b9a3b..26e61c1 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -469,15 +469,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SCC1_ENET #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index ce5e691..b7fe824 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -474,14 +474,6 @@ MAMR_AMA_TYPE_2 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A9 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SCC1_ENET #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index d77df9c..e10270b 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -474,15 +474,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_NET_MULTI #define CONFIG_SCC1_ENET #define CONFIG_FEC_ENET diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index a6c465b..49b1c83 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -475,15 +475,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_NET_MULTI #define CONFIG_SCC1_ENET #define CONFIG_FEC_ENET diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index 9ec815c..c4d0874 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -496,14 +496,6 @@ MAMR_AMA_TYPE_2 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A9 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SCC1_ENET #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h index c715c07..07a0d91 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -482,14 +482,6 @@ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Network configuration */ #define CONFIG_SCC2_ENET /* enable ethernet on SCC2 */ diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h index 7510ab1..a26fb97 100644 --- a/include/configs/Total5200.h +++ b/include/configs/Total5200.h @@ -46,9 +46,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/VOH405.h b/include/configs/VOH405.h index b9ea610..a8333a7 100644 --- a/include/configs/VOH405.h +++ b/include/configs/VOH405.h @@ -409,14 +409,6 @@ #define CONFIG_SYS_EEPROM_WP (0x80000000 >> 0)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Default speed selection (cpu_plb_opb_ebc) in mhz. * This value will be set if iic boot eprom is disabled. */ diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index a88b41a..3d50b81 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -287,14 +287,6 @@ #define CONFIG_SYS_GPIO0_TCR 0xF7FE0014 /* 0 ... 31 */
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Default speed selection (cpu_plb_opb_ebc) in mhz. * This value will be set if iic boot eprom is disabled. */ diff --git a/include/configs/VoVPN-GW.h b/include/configs/VoVPN-GW.h index 3614184..e2ebe20 100644 --- a/include/configs/VoVPN-GW.h +++ b/include/configs/VoVPN-GW.h @@ -313,10 +313,6 @@ #define CONFIG_SYS_MONITOR_LEN 0x00020000 #define CONFIG_SYS_MALLOC_LEN 0x00020000
-/* boot flags */ -#define BOOTFLAG_COLD 0x01 /* normal power-on */ -#define BOOTFLAG_WARM 0x02 /* software reboot */ - /* cache configuration */ #define CONFIG_SYS_CACHELINE_SIZE 32 /* for MPC8260 */ #if defined(CONFIG_CMD_KGDB) diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h index 0fbe80c..7ec9754 100644 --- a/include/configs/W7OLMC.h +++ b/include/configs/W7OLMC.h @@ -316,15 +316,6 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h index f12fa55..76435ae 100644 --- a/include/configs/W7OLMG.h +++ b/include/configs/W7OLMG.h @@ -319,15 +319,6 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/WUH405.h b/include/configs/WUH405.h index 34a5fff..bfaefa0 100644 --- a/include/configs/WUH405.h +++ b/include/configs/WUH405.h @@ -348,14 +348,6 @@ #define CONFIG_SYS_DUART_RST (0x80000000 >> 14)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Default speed selection (cpu_plb_opb_ebc) in mhz. * This value will be set if iic boot eprom is disabled. */ diff --git a/include/configs/XPEDITE1000.h b/include/configs/XPEDITE1000.h index 8b47862..e3cf37f 100644 --- a/include/configs/XPEDITE1000.h +++ b/include/configs/XPEDITE1000.h @@ -247,12 +247,6 @@ extern void out32(unsigned int, unsigned long); #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
/* - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Environment Configuration */ #define CONFIG_ENV_IS_IN_FLASH 1 diff --git a/include/configs/XPEDITE5170.h b/include/configs/XPEDITE5170.h index 306baed..e0349e0 100644 --- a/include/configs/XPEDITE5170.h +++ b/include/configs/XPEDITE5170.h @@ -576,12 +576,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_BOOTM_LEN (16 << 20) /* Increase max gunzip size */
/* - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Environment Configuration */ #define CONFIG_ENV_IS_IN_FLASH 1 diff --git a/include/configs/XPEDITE5200.h b/include/configs/XPEDITE5200.h index 1fbe4fb..f7345e7 100644 --- a/include/configs/XPEDITE5200.h +++ b/include/configs/XPEDITE5200.h @@ -370,12 +370,6 @@ #define CONFIG_SYS_BOOTM_LEN (16 << 20) /* Increase max gunzip size */
/* - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Environment Configuration */ #define CONFIG_ENV_IS_IN_FLASH 1 diff --git a/include/configs/XPEDITE5370.h b/include/configs/XPEDITE5370.h index 8225fff..b7fa021 100644 --- a/include/configs/XPEDITE5370.h +++ b/include/configs/XPEDITE5370.h @@ -427,12 +427,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_BOOTM_LEN (16 << 20) /* Increase max gunzip size */
/* - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Environment Configuration */ #define CONFIG_ENV_IS_IN_FLASH 1 diff --git a/include/configs/Yukon8220.h b/include/configs/Yukon8220.h index 8ec6c84..56e199d 100644 --- a/include/configs/Yukon8220.h +++ b/include/configs/Yukon8220.h @@ -39,9 +39,6 @@ #define CONFIG_SYS_MPC8220_CLKIN 30000000/* ... running at 30MHz */ #define CONFIG_SYS_MPC8220_SYSPLL_VCO_MULTIPLIER 16 /* VCO multiplier can't be read from any register */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* * Serial console configuration */ diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h index 8ae765c..796a9bd 100644 --- a/include/configs/ZPC1900.h +++ b/include/configs/ZPC1900.h @@ -212,9 +212,6 @@ #define CONFIG_SYS_HRCW_SLAVE6 0 #define CONFIG_SYS_HRCW_SLAVE7 0
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_MONITOR_BASE TEXT_BASE #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_RAMBOOT diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h index fcc47a9..8cdf890 100644 --- a/include/configs/ZUMA.h +++ b/include/configs/ZUMA.h @@ -387,12 +387,4 @@ */ #define CONFIG_GT_I2C
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h index a54ab1d..6dcebe6 100644 --- a/include/configs/a4m072.h +++ b/include/configs/a4m072.h @@ -41,9 +41,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/aev.h b/include/configs/aev.h index 54e6c57..2b9e882 100644 --- a/include/configs/aev.h +++ b/include/configs/aev.h @@ -43,9 +43,6 @@
#define CONFIG_HIGH_BATS 1 /* High BATs supported */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* * Serial console configuration */ diff --git a/include/configs/alpr.h b/include/configs/alpr.h index 7038291..9042361 100644 --- a/include/configs/alpr.h +++ b/include/configs/alpr.h @@ -362,14 +362,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/aria.h b/include/configs/aria.h index c5a3feb..b82ddfd 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -525,14 +525,6 @@
#define CONFIG_HIGH_BATS 1 /* High BATs supported */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 -#define BOOTFLAG_WARM 0x02 - #ifdef CONFIG_CMD_KGDB #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/atc.h b/include/configs/atc.h index 24015b7..620fdb4 100644 --- a/include/configs/atc.h +++ b/include/configs/atc.h @@ -280,14 +280,6 @@ #define CONFIG_ENV_SIZE 2048 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 /* 16-byte page size */ #endif -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ -
/*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/barco.h b/include/configs/barco.h index b1af701..89ae56b 100644 --- a/include/configs/barco.h +++ b/include/configs/barco.h @@ -353,15 +353,6 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* values according to the manual */
#define CONFIG_DRAM_50MHZ 1 diff --git a/include/configs/c2mon.h b/include/configs/c2mon.h index 4508d75..3bd8164 100644 --- a/include/configs/c2mon.h +++ b/include/configs/c2mon.h @@ -417,13 +417,4 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/canmb.h b/include/configs/canmb.h index 1f275e5..07d7d0e 100644 --- a/include/configs/canmb.h +++ b/include/configs/canmb.h @@ -35,9 +35,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_HIGH_BATS 1 /* High BATs supported */ diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index 72cf941..9f026e9 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -317,9 +317,6 @@ #define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI #define CONFIG_SYS_HID0_FINAL HID0_ICE
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_XLB_PIPELINING 1 /* enable transaction pipeling */
/* diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h index c3c603b..f3068a9 100644 --- a/include/configs/cmi_mpc5xx.h +++ b/include/configs/cmi_mpc5xx.h @@ -267,13 +267,4 @@ */ #define CONFIG_SYS_DER 0x00000000
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h index 566565a..d5648d6 100644 --- a/include/configs/cogent_mpc8260.h +++ b/include/configs/cogent_mpc8260.h @@ -407,13 +407,4 @@ #endif
#endif - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/cogent_mpc8xx.h b/include/configs/cogent_mpc8xx.h index 750c0df..5b94a3d 100644 --- a/include/configs/cogent_mpc8xx.h +++ b/include/configs/cogent_mpc8xx.h @@ -364,13 +364,4 @@ #define CONFIG_SYS_OR3_PRELIM ((~(CONFIG_SYS_CMA_CS3_SIZE-1)&OR_AM_MSK)|OR_BI|OR_SETA)
#endif - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 9184eeb..241df26 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -587,14 +587,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #ifdef CONFIG_CMD_KGDB #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/cpci5200.h b/include/configs/cpci5200.h index f7290d6..b4d641d 100644 --- a/include/configs/cpci5200.h +++ b/include/configs/cpci5200.h @@ -47,9 +47,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/csb272.h b/include/configs/csb272.h index 7108210..deee3ff 100644 --- a/include/configs/csb272.h +++ b/include/configs/csb272.h @@ -303,13 +303,4 @@ #define CONFIG_SYS_I2C_PLL_ADDR 0x58 /* I2C address of AMIS FS6377-01 PLL */ #define CONFIG_I2CFAST 1 /* enable "i2cfast" env. setting */
-/* - * Internal Definitions - * - * Boot Flags - * - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/csb472.h b/include/configs/csb472.h index 7b9f29a..dc20484 100644 --- a/include/configs/csb472.h +++ b/include/configs/csb472.h @@ -301,13 +301,4 @@ */ #define CONFIG_I2CFAST 1 /* enable "i2cfast" env. setting */
-/* - * Internal Definitions - * - * Boot Flags - * - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/debris.h b/include/configs/debris.h index dc59df9..7cd58b2 100644 --- a/include/configs/debris.h +++ b/include/configs/debris.h @@ -451,16 +451,6 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /* values according to the manual */
#define CONFIG_DRAM_50MHZ 1 diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index 7a1a7c3..5c0de7a 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -42,9 +42,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000
-#define BOOTFLAG_COLD 0x01 -#define BOOTFLAG_WARM 0x02 - #define CONFIG_SYS_CACHELINE_SIZE 32
/* diff --git a/include/configs/eXalion.h b/include/configs/eXalion.h index 85bf236..6f9b655 100644 --- a/include/configs/eXalion.h +++ b/include/configs/eXalion.h @@ -412,16 +412,6 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
- -/*----------------------------------------------------------------------- - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - /* values according to the manual */ #define CONFIG_DRAM_50MHZ 1 #define CONFIG_SDRAM_50MHZ diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h index a738425..4a99ca6 100644 --- a/include/configs/ep8248.h +++ b/include/configs/ep8248.h @@ -232,9 +232,6 @@ #define CONFIG_SYS_HRCW_SLAVE6 0 #define CONFIG_SYS_HRCW_SLAVE7 0
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_MALLOC_LEN (4096 << 10) /* Reserve 4 MB for malloc() */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h index 3f4425a..ecc8a09 100644 --- a/include/configs/ep8260.h +++ b/include/configs/ep8260.h @@ -746,14 +746,6 @@ #endif
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * JFFS2 partitions * */ diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h index b52b941..83b57c5 100644 --- a/include/configs/ep82xxm.h +++ b/include/configs/ep82xxm.h @@ -361,9 +361,6 @@ #define CONFIG_SYS_HRCW_SLAVE6 0 #define CONFIG_SYS_HRCW_SLAVE7 0
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_MALLOC_LEN (4096 << 10) /* Reserve 4 MB for malloc() */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
diff --git a/include/configs/galaxy5200.h b/include/configs/galaxy5200.h index 29951f7..b802dca 100644 --- a/include/configs/galaxy5200.h +++ b/include/configs/galaxy5200.h @@ -42,8 +42,6 @@ #define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */ #define CONFIG_SYS_MPC5XXX_CLKIN 33333333 /* ... running at 33.333333MHz */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */
/* * Serial console configuration diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h index 9ed3846..5f64b93 100644 --- a/include/configs/gw8260.h +++ b/include/configs/gw8260.h @@ -819,13 +819,4 @@ ORxG_SCY_11_CLK |\ ORxG_EHTR) #endif /* CONFIG_SYS_IO_BASE */ - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/hermes.h b/include/configs/hermes.h index 0df46fa..818bfd2 100644 --- a/include/configs/hermes.h +++ b/include/configs/hermes.h @@ -332,13 +332,4 @@ #define CONFIG_SYS_MAMR_9COL ((CONFIG_SYS_MAMR_PTA << MAMR_PTA_SHIFT) | MAMR_PTAE | \ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X) - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h index 8b0b773..d6b1fc1 100644 --- a/include/configs/hmi1001.h +++ b/include/configs/hmi1001.h @@ -35,9 +35,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_HIGH_BATS 1 /* High BATs supported */ diff --git a/include/configs/hymod.h b/include/configs/hymod.h index 5a282ff..0591c51 100644 --- a/include/configs/hymod.h +++ b/include/configs/hymod.h @@ -728,14 +728,6 @@ #define FPGA_MAIN_IRQ SIU_INT_IRQ2
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH*/ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * JFFS2 partitions * */ diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index 69365e6..808cc5c 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -38,9 +38,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_MISC_INIT_F 1 /* Use misc_init_f() */
#define CONFIG_HIGH_BATS 1 /* High BATs supported */ diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index 6903b36..66338bf 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -41,9 +41,6 @@
#define CONFIG_MISC_INIT_R
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */ #ifdef CONFIG_CMD_KGDB #define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h index 9c45acf..32bd4ee 100644 --- a/include/configs/jupiter.h +++ b/include/configs/jupiter.h @@ -38,9 +38,6 @@ #define CONFIG_BOARD_EARLY_INIT_R 1 #define CONFIG_BOARD_EARLY_INIT_F 1
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/km8xx.h b/include/configs/km8xx.h index a10744e..2a42e99 100644 --- a/include/configs/km8xx.h +++ b/include/configs/km8xx.h @@ -271,14 +271,6 @@ #define CONFIG_SYS_BR3_PRELIM (0x30000401) #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SCC3_ENET #define CONFIG_ETHPRIME "SCC" #define CONFIG_HAS_ETH0 diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h index 4794256..5009533 100644 --- a/include/configs/kmeter1.h +++ b/include/configs/kmeter1.h @@ -440,14 +440,6 @@ #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U #endif /* CONFIG_PCI */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define BOOTFLASH_START F0000000
#define CONFIG_PRAM 512 /* protected RAM [KBytes] */ diff --git a/include/configs/korat.h b/include/configs/korat.h index 55ef4f0..0116107 100644 --- a/include/configs/korat.h +++ b/include/configs/korat.h @@ -552,14 +552,6 @@ } \ }
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/kvme080.h b/include/configs/kvme080.h index 0d95263..b406c11 100644 --- a/include/configs/kvme080.h +++ b/include/configs/kvme080.h @@ -268,7 +268,4 @@ #define CONFIG_SYS_DBAT3L CONFIG_SYS_IBAT3L #define CONFIG_SYS_DBAT3U CONFIG_SYS_IBAT3U
-#define BOOTFLAG_COLD 0x01 -#define BOOTFLAG_WARM 0x02 - #endif /* __CONFIG_H */ diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h index 6883e79..7c3eb64 100644 --- a/include/configs/linkstation.h +++ b/include/configs/linkstation.h @@ -495,12 +495,4 @@ */ #define CONFIG_DOS_PARTITION
-/*----------------------------------------------------------------------- - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h index be20d72..8f31f38 100644 --- a/include/configs/lwmon.h +++ b/include/configs/lwmon.h @@ -610,12 +610,4 @@ */ #define CONFIG_SYS_MAR 0x00000088
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 4a3b1dc..ed6c6c8 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -644,14 +644,6 @@ } \ }
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/manroland/common.h b/include/configs/manroland/common.h index 291b669..9b02b03 100644 --- a/include/configs/manroland/common.h +++ b/include/configs/manroland/common.h @@ -29,9 +29,6 @@ * (easy to change) */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_BOARD_EARLY_INIT_R
/* Partitions */ diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h index 7ef6385..0e9f346 100644 --- a/include/configs/mcc200.h +++ b/include/configs/mcc200.h @@ -37,9 +37,6 @@
#define CONFIG_MISC_INIT_R
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h index a26de0b..3a0e476 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -361,14 +361,6 @@
#define CONFIG_HIGH_BATS 1 /* High BATs supported */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #ifdef CONFIG_CMD_KGDB #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h index 73405ea..846a51a 100644 --- a/include/configs/mecp5200.h +++ b/include/configs/mecp5200.h @@ -47,9 +47,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h index 55d1fc9..9152d2b 100644 --- a/include/configs/mgcoge.h +++ b/include/configs/mgcoge.h @@ -193,9 +193,6 @@ #define CONFIG_SYS_HRCW_SLAVE6 0 #define CONFIG_SYS_HRCW_SLAVE7 0
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
#define CONFIG_SYS_CACHELINE_SIZE 32 /* For MPC8260 CPUs */ diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index fa4310b..dff77a0 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -411,9 +411,6 @@ extern void __led_set(led_id_t id, int state); #define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI #define CONFIG_SYS_HID0_FINAL HID0_ICE
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 3740316..fb269dd 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -496,14 +496,6 @@
#define CONFIG_HIGH_BATS 1 /* High BATs supported */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #ifdef CONFIG_CMD_KGDB #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h index 497ea42..328356f 100644 --- a/include/configs/mpc7448hpc2.h +++ b/include/configs/mpc7448hpc2.h @@ -399,13 +399,5 @@
#define L2_INIT 0 #define L2_ENABLE (L2_INIT | L2CR_L2E) - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ #define CONFIG_SYS_SERIAL_HANG_IN_EXCEPTION #endif /* __CONFIG_H */ diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index b5a19e4..2cd821e 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -486,14 +486,6 @@ #define CONFIG_SYS_DBAT3U CONFIG_SYS_IBAT3U
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * Environment Configuration */
diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h index 43f46bf..7f184ae 100644 --- a/include/configs/muas3001.h +++ b/include/configs/muas3001.h @@ -275,9 +275,6 @@ #define CONFIG_SYS_HRCW_SLAVE6 0 #define CONFIG_SYS_HRCW_SLAVE7 0
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_SYS_MALLOC_LEN (4096 << 10) /* Reserve 4 MB for malloc() */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
diff --git a/include/configs/munices.h b/include/configs/munices.h index fa5230f..270f608 100644 --- a/include/configs/munices.h +++ b/include/configs/munices.h @@ -32,8 +32,6 @@ #define CONFIG_MPC5200_DDR 1 /* (with DDR-SDRAM) */ #define CONFIG_MUNICES 1 /* ... on MUNICes board */ #define CONFIG_SYS_MPC5XXX_CLKIN 33333333 /* ... running at 33.333333MHz */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ #define CONFIG_SYS_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */ #define CONFIG_HIGH_BATS 1 /* High BATs supported */
diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h index bdc0f79..a30529b 100644 --- a/include/configs/o2dnt.h +++ b/include/configs/o2dnt.h @@ -34,9 +34,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h index 17ec08f..323808e 100644 --- a/include/configs/p3mx.h +++ b/include/configs/p3mx.h @@ -447,12 +447,4 @@
#define L2_ENABLE (L2_INIT | L2CR_L2E)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h index 6edf91e..4935fb9 100644 --- a/include/configs/p3p440.h +++ b/include/configs/p3p440.h @@ -318,14 +318,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h index 8acf3c7..651eabf 100644 --- a/include/configs/pcm030.h +++ b/include/configs/pcm030.h @@ -42,8 +42,6 @@ High Level Configuration Options #define CONFIG_PHYCORE_MPC5200B_TINY 1 /* phyCORE-MPC5200B -> */ /* FEC configuration and IDE */ #define CONFIG_SYS_MPC5XXX_CLKIN 33333333 /* ... running at 33.333333MHz */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */
/*----------------------------------------------------------------------------- Serial console configuration diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h index 85152d1..f459df7 100644 --- a/include/configs/pcs440ep.h +++ b/include/configs/pcs440ep.h @@ -443,14 +443,6 @@ } \ }
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h index f073fcd..8306496 100644 --- a/include/configs/pdm360ng.h +++ b/include/configs/pdm360ng.h @@ -432,14 +432,6 @@
#define CONFIG_HIGH_BATS 1 /* High BATs supported */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #ifdef CONFIG_CMD_KGDB #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/pf5200.h b/include/configs/pf5200.h index 80a0bc6..d3f78d6 100644 --- a/include/configs/pf5200.h +++ b/include/configs/pf5200.h @@ -46,9 +46,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */ /* * Serial console configuration diff --git a/include/configs/ppmc7xx.h b/include/configs/ppmc7xx.h index 04779c4..646f4e4 100644 --- a/include/configs/ppmc7xx.h +++ b/include/configs/ppmc7xx.h @@ -414,16 +414,4 @@
#define CONFIG_SYS_BOARD_ASM_INIT
- -/* - * Boot flags - * - * BOOTFLAG_COLD - Indicates a power-on boot - * BOOTFLAG_WARM - Indicates a software reset - */ - -#define BOOTFLAG_COLD 0x01 -#define BOOTFLAG_WARM 0x02 - - #endif /* __CONFIG_H */ diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h index f387601..06151af 100644 --- a/include/configs/ppmc8260.h +++ b/include/configs/ppmc8260.h @@ -1004,13 +1004,4 @@ ORxG_TRLX |\ ORxG_EHTR) #endif /* CONFIG_SYS_LED_BASE */ - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/quantum.h b/include/configs/quantum.h index e440e93..1665217 100644 --- a/include/configs/quantum.h +++ b/include/configs/quantum.h @@ -405,14 +405,6 @@ MAMR_RLFA_16X | MAMR_WLFA_16X | MAMR_TLFA_16X)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * BCSRx * * Board Status and Control Registers diff --git a/include/configs/rmu.h b/include/configs/rmu.h index 026826b..75e8bc5 100644 --- a/include/configs/rmu.h +++ b/include/configs/rmu.h @@ -381,14 +381,6 @@ MAMR_RLFA_16X | MAMR_WLFA_16X | MAMR_TLFA_16X)
/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/* * BCSRx * * Board Status and Control Registers diff --git a/include/configs/rsdproto.h b/include/configs/rsdproto.h index 8207844..d4c57ce 100644 --- a/include/configs/rsdproto.h +++ b/include/configs/rsdproto.h @@ -419,12 +419,4 @@ #define CONFIG_SYS_OR5_PRELIM (P2SZ_TO_AM(PHYS_DPRAM_SHARC_SIZE) | \ ORxG_ACS_DIV4)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h index b0198aa..1a77bbc 100644 --- a/include/configs/sacsng.h +++ b/include/configs/sacsng.h @@ -1062,12 +1062,4 @@ ORxG_EHTR) #endif /* (defined(CONFIG_SYS_FLASH1_BASE) && defined(CONFIG_SYS_FLASH1_SIZE)) */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h index 187002c..7954388 100644 --- a/include/configs/sbc405.h +++ b/include/configs/sbc405.h @@ -274,12 +274,4 @@ #define SPD_EEPROM_ADDRESS 0x50 #define CONFIG_SPD_EEPROM 1 /* use SPD EEPROM for setup */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/sbc8240.h b/include/configs/sbc8240.h index 1cc2920..f657d49 100644 --- a/include/configs/sbc8240.h +++ b/include/configs/sbc8240.h @@ -353,14 +353,6 @@ typedef unsigned int led_id_t; # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /*----------------------------------------------------------------------- * PCI stuff *----------------------------------------------------------------------- diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h index 3fa80a8..e71c491 100644 --- a/include/configs/sbc8260.h +++ b/include/configs/sbc8260.h @@ -1076,13 +1076,4 @@ ORxG_TRLX |\ ORxG_EHTR) #endif /* CONFIG_SYS_LED_BASE */ - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index b8f4b6e..2ffa3b8 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -612,14 +612,6 @@ #define CONFIG_SYS_DBAT7L CONFIG_SYS_IBAT7L #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index 8d047de..7a371cb 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -516,14 +516,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux*/
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h index 6352278..f6bd3b3 100644 --- a/include/configs/sbc8560.h +++ b/include/configs/sbc8560.h @@ -422,14 +422,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 490d4f5..e7e27e3 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -541,14 +541,6 @@ #define CONFIG_SYS_CACHELINE_SHIFT 5 /*log base 2 of the above value*/ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/sc3.h b/include/configs/sc3.h index 278b60e..62c5074 100644 --- a/include/configs/sc3.h +++ b/include/configs/sc3.h @@ -484,14 +484,6 @@ /* Initial value of the stack pointern in internal SRAM */ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* ################################################################################### */ /* These defines will be used in arch/powerpc/cpu/ppc4xx/cpu_init.c to setup external chip selects */ /* They are currently undefined cause they are initiaized in board/solidcard3/init.S */ diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 88be349..c4994f0 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -388,14 +388,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port*/ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h index 5db1379..970974c 100644 --- a/include/configs/sorcery.h +++ b/include/configs/sorcery.h @@ -38,9 +38,6 @@ #define CONFIG_SYS_MPC8220_CLKIN 60000000 /* ... running at 60MHz */ #define CONFIG_SYS_MPC8220_SYSPLL_VCO_MULTIPLIER 8 /* VCO multiplier can't be read from any register */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* * Serial console configuration */ diff --git a/include/configs/spc1920.h b/include/configs/spc1920.h index 1fe2a04..87adaa0 100644 --- a/include/configs/spc1920.h +++ b/include/configs/spc1920.h @@ -422,12 +422,4 @@
#define CONFIG_SYS_BR5_PRELIM ((CONFIG_SYS_SPC1920_PLD_BASE & BR_BA_MSK) | BR_PS_8 | BR_V)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/spieval.h b/include/configs/spieval.h index d377e19..3ce2a31 100644 --- a/include/configs/spieval.h +++ b/include/configs/spieval.h @@ -41,9 +41,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h index 891d2bf..3a996c2 100644 --- a/include/configs/stxgp3.h +++ b/include/configs/stxgp3.h @@ -364,14 +364,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h index 911c906..b600459 100644 --- a/include/configs/stxssa.h +++ b/include/configs/stxssa.h @@ -396,14 +396,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h index 5854366..65496ba 100644 --- a/include/configs/stxxtc.h +++ b/include/configs/stxxtc.h @@ -430,14 +430,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_LAST_STAGE_INIT /* needed to reset the damn phys */
/****************************************************************/ diff --git a/include/configs/svm_sc8xx.h b/include/configs/svm_sc8xx.h index 425f472..4f653ff 100644 --- a/include/configs/svm_sc8xx.h +++ b/include/configs/svm_sc8xx.h @@ -465,13 +465,4 @@ #define CONFIG_SYS_DOC_SUPPORT_MILLENNIUM #define CONFIG_SYS_DOC_BASE 0x80000000
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/uc100.h b/include/configs/uc100.h index 23f4c82..6b6be86 100644 --- a/include/configs/uc100.h +++ b/include/configs/uc100.h @@ -499,14 +499,6 @@ #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 /* takes up to 10 msec */ #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_FEC_ENET 1 /* use FEC ethernet */ #define FEC_ENET #define CONFIG_MII diff --git a/include/configs/utx8245.h b/include/configs/utx8245.h index 1a47aad..fa37976 100644 --- a/include/configs/utx8245.h +++ b/include/configs/utx8245.h @@ -425,13 +425,4 @@ protect on ${u-boot_startaddr} ${u-boot_endaddr}" # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - - #endif /* __CONFIG_H */ diff --git a/include/configs/v37.h b/include/configs/v37.h index 7f1670e..a2f6be3 100644 --- a/include/configs/v37.h +++ b/include/configs/v37.h @@ -391,12 +391,4 @@ MAMR_AMA_TYPE_2 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A12 | \ MAMR_GPL_A4DIS | MAMR_RLFA_4X | MAMR_WLFA_3X | MAMR_TLFA_16X)
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #endif /* __CONFIG_H */ diff --git a/include/configs/v38b.h b/include/configs/v38b.h index 600ccfb..92ea86c 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -44,9 +44,6 @@
#define CONFIG_SYS_XLB_PIPELINING 1 /* gives better performance */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index 45976db..8d43eec 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -475,14 +475,6 @@ #define CONFIG_SYS_DBAT7L CONFIG_SYS_IBAT7L #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #define CONFIG_NETDEV eth0
#define CONFIG_HOSTNAME ve8313 diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h index 7046e67..57b0d0b 100644 --- a/include/configs/virtlab2.h +++ b/include/configs/virtlab2.h @@ -475,15 +475,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X)
- -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* Map peripheral control registers on CS4 */ #define CONFIG_SYS_PERIPHERAL_BASE 0xA0000000 #define CONFIG_SYS_PERIPHERAL_OR_AM 0xFFFF8000 /* 32 kB address mask */ diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index f2fb592..fb71185 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -538,14 +538,6 @@ #define CONFIG_SYS_DBAT7L CONFIG_SYS_IBAT7L #define CONFIG_SYS_DBAT7U CONFIG_SYS_IBAT7U
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ diff --git a/include/configs/zeus.h b/include/configs/zeus.h index 06d4526..65fc1d3 100644 --- a/include/configs/zeus.h +++ b/include/configs/zeus.h @@ -302,14 +302,6 @@ #define CONFIG_SYS_TIME_POST 5000 #define CONFIG_SYS_TIME_FACTORY_RESET 10000
-/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
Dear Peter Tyser,
In message 1287117204-9418-1-git-send-email-ptyser@xes-inc.com you wrote:
Now that warm booting is not supported, there isn't a need for the BOOTFLAG_COLD and BOOTFLAG_WARM defines, so remove them.
Note that this change makes the board info bd_bootflags field useless. It will always be set to 0, but we leave it around so that we don't break the board info structure that some OSes are expecting to be passed from U-Boot.
Signed-off-by: Peter Tyser ptyser@xes-inc.com
Changes since v1:
- Rebased
arch/powerpc/cpu/74xx_7xx/start.S | 1 + arch/powerpc/cpu/mpc512x/start.S | 1 + arch/powerpc/cpu/mpc5xx/start.S | 1 + arch/powerpc/cpu/mpc5xxx/start.S | 1 + arch/powerpc/cpu/mpc8220/start.S | 1 + arch/powerpc/cpu/mpc824x/start.S | 1 + arch/powerpc/cpu/mpc8260/start.S | 1 + arch/powerpc/cpu/mpc83xx/start.S | 1 + arch/powerpc/cpu/mpc86xx/start.S | 1 + arch/powerpc/cpu/mpc8xx/start.S | 1 + arch/powerpc/include/asm/u-boot.h | 2 +- arch/powerpc/lib/board.c | 2 -- board/fads/fads.h | 8 -------- include/configs/A3000.h | 8 -------- include/configs/ADCIOP.h | 9 --------- include/configs/AMX860.h | 8 -------- include/configs/AP1000.h | 8 -------- include/configs/APC405.h | 8 -------- include/configs/AR405.h | 8 -------- include/configs/ASH405.h | 8 -------- include/configs/ATUM8548.h | 8 -------- include/configs/Adder.h | 8 -------- include/configs/Alaska8220.h | 3 --- include/configs/BAB7xx.h | 9 --------- include/configs/BC3450.h | 3 --- include/configs/BMW.h | 9 --------- include/configs/CANBT.h | 9 --------- include/configs/CATcenter.h | 9 --------- include/configs/CMS700.h | 8 -------- include/configs/CPC45.h | 10 ---------- include/configs/CPCI2DP.h | 8 -------- include/configs/CPCI405.h | 9 --------- include/configs/CPCI4052.h | 9 --------- include/configs/CPCI405AB.h | 9 --------- include/configs/CPCI405DT.h | 8 -------- include/configs/CPCI750.h | 8 -------- include/configs/CPCIISER4.h | 8 -------- include/configs/CPU86.h | 9 --------- include/configs/CPU87.h | 9 --------- include/configs/CRAYL1.h | 8 -------- include/configs/CU824.h | 8 -------- include/configs/DASA_SIM.h | 9 --------- include/configs/DB64360.h | 8 -------- include/configs/DB64460.h | 8 -------- include/configs/DP405.h | 8 -------- include/configs/DU405.h | 9 --------- include/configs/DU440.h | 8 -------- include/configs/ELPPC.h | 8 -------- include/configs/ELPT860.h | 13 ------------- include/configs/EP88x.h | 8 -------- include/configs/ERIC.h | 8 -------- include/configs/ESTEEM192E.h | 18 ------------------ include/configs/ETX094.h | 9 --------- include/configs/EVB64260.h | 8 -------- include/configs/EXBITGEN.h | 8 -------- include/configs/FADS823.h | 7 ------- include/configs/FADS850SAR.h | 8 -------- include/configs/FLAGADM.h | 8 -------- include/configs/FPS850L.h | 9 --------- include/configs/FPS860L.h | 9 --------- include/configs/G2000.h | 8 -------- include/configs/GEN860T.h | 6 ------ include/configs/GENIETV.h | 8 -------- include/configs/HH405.h | 8 -------- include/configs/HIDDEN_DRAGON.h | 8 -------- include/configs/HUB405.h | 8 -------- include/configs/IAD210.h | 9 --------- include/configs/ICU862.h | 7 ------- include/configs/IDS8247.h | 9 --------- include/configs/IP860.h | 14 -------------- include/configs/IPHASE4539.h | 9 --------- include/configs/ISPAN.h | 8 -------- include/configs/IVML24.h | 9 --------- include/configs/IVMS8.h | 9 --------- include/configs/IceCube.h | 3 --- include/configs/JSE.h | 9 --------- include/configs/KAREF.h | 8 -------- include/configs/KUP4K.h | 9 --------- include/configs/KUP4X.h | 9 --------- include/configs/LANTEC.h | 8 -------- include/configs/MBX.h | 8 -------- include/configs/MBX860T.h | 8 -------- include/configs/METROBOX.h | 8 -------- include/configs/MHPC.h | 8 -------- include/configs/MIP405.h | 9 --------- include/configs/ML2.h | 8 -------- include/configs/MOUSSE.h | 9 --------- include/configs/MPC8260ADS.h | 3 --- include/configs/MPC8266ADS.h | 3 --- include/configs/MPC8308RDB.h | 8 -------- include/configs/MPC8313ERDB.h | 8 -------- include/configs/MPC8315ERDB.h | 8 -------- include/configs/MPC8323ERDB.h | 8 -------- include/configs/MPC832XEMDS.h | 8 -------- include/configs/MPC8349EMDS.h | 8 -------- include/configs/MPC8349ITX.h | 8 -------- include/configs/MPC8360EMDS.h | 8 -------- include/configs/MPC8360ERDK.h | 8 -------- include/configs/MPC837XEMDS.h | 8 -------- include/configs/MPC837XERDB.h | 8 -------- include/configs/MPC8536DS.h | 8 -------- include/configs/MPC8540ADS.h | 8 -------- include/configs/MPC8540EVAL.h | 8 -------- include/configs/MPC8541CDS.h | 8 -------- include/configs/MPC8544DS.h | 8 -------- include/configs/MPC8548CDS.h | 8 -------- include/configs/MPC8555CDS.h | 8 -------- include/configs/MPC8560ADS.h | 8 -------- include/configs/MPC8568MDS.h | 8 -------- include/configs/MPC8569MDS.h | 8 -------- include/configs/MPC8572DS.h | 8 -------- include/configs/MPC8610HPCD.h | 8 -------- include/configs/MPC8641HPCN.h | 8 -------- include/configs/MUSENKI.h | 8 -------- include/configs/MVBC_P.h | 3 --- include/configs/MVBLM7.h | 9 --------- include/configs/MVBLUE.h | 9 --------- include/configs/MVS1.h | 9 --------- include/configs/MVSMR.h | 3 --- include/configs/NC650.h | 8 -------- include/configs/NETPHONE.h | 8 -------- include/configs/NETTA.h | 8 -------- include/configs/NETTA2.h | 8 -------- include/configs/NETVIA.h | 8 -------- include/configs/NSCU.h | 9 --------- include/configs/NX823.h | 9 --------- include/configs/OCRTC.h | 9 --------- include/configs/ORSG.h | 9 --------- include/configs/OXC.h | 9 --------- include/configs/P1022DS.h | 8 -------- include/configs/P1_P2_RDB.h | 8 -------- include/configs/P2020DS.h | 8 -------- include/configs/P3G4.h | 8 -------- include/configs/PATI.h | 10 ---------- include/configs/PCI405.h | 8 -------- include/configs/PCIPPC2.h | 8 -------- include/configs/PCIPPC6.h | 8 -------- include/configs/PIP405.h | 9 --------- include/configs/PLU405.h | 8 -------- include/configs/PM520.h | 3 --- include/configs/PM826.h | 9 --------- include/configs/PM828.h | 9 --------- include/configs/PM854.h | 8 -------- include/configs/PM856.h | 8 -------- include/configs/PMC405.h | 8 -------- include/configs/PMC440.h | 8 -------- include/configs/PN62.h | 10 ---------- include/configs/PPChameleonEVB.h | 9 --------- include/configs/QS823.h | 8 -------- include/configs/QS850.h | 8 -------- include/configs/QS860T.h | 9 --------- include/configs/R360MPI.h | 9 --------- include/configs/RBC823.h | 9 --------- include/configs/RPXClassic.h | 9 --------- include/configs/RPXlite.h | 9 --------- include/configs/RPXlite_DW.h | 8 -------- include/configs/RPXsuper.h | 8 -------- include/configs/RRvision.h | 8 -------- include/configs/Rattler.h | 3 --- include/configs/SBC8540.h | 8 -------- include/configs/SCM.h | 9 --------- include/configs/SIMPC8313.h | 8 -------- include/configs/SM850.h | 9 --------- include/configs/SPD823TS.h | 8 -------- include/configs/SXNI855T.h | 7 ------- include/configs/Sandpoint8240.h | 10 ---------- include/configs/Sandpoint8245.h | 10 ---------- include/configs/TB5200.h | 3 --- include/configs/TK885D.h | 8 -------- include/configs/TOP5200.h | 3 --- include/configs/TOP860.h | 8 -------- include/configs/TQM5200.h | 3 --- include/configs/TQM823L.h | 9 --------- include/configs/TQM823M.h | 9 --------- include/configs/TQM8260.h | 9 --------- include/configs/TQM8272.h | 8 -------- include/configs/TQM834x.h | 8 -------- include/configs/TQM850L.h | 9 --------- include/configs/TQM850M.h | 9 --------- include/configs/TQM855L.h | 9 --------- include/configs/TQM855M.h | 9 --------- include/configs/TQM85xx.h | 8 -------- include/configs/TQM860L.h | 9 --------- include/configs/TQM860M.h | 8 -------- include/configs/TQM862L.h | 9 --------- include/configs/TQM862M.h | 9 --------- include/configs/TQM866M.h | 8 -------- include/configs/TQM885D.h | 8 -------- include/configs/Total5200.h | 3 --- include/configs/VOH405.h | 8 -------- include/configs/VOM405.h | 8 -------- include/configs/VoVPN-GW.h | 4 ---- include/configs/W7OLMC.h | 9 --------- include/configs/W7OLMG.h | 9 --------- include/configs/WUH405.h | 8 -------- include/configs/XPEDITE1000.h | 6 ------ include/configs/XPEDITE5170.h | 6 ------ include/configs/XPEDITE5200.h | 6 ------ include/configs/XPEDITE5370.h | 6 ------ include/configs/Yukon8220.h | 3 --- include/configs/ZPC1900.h | 3 --- include/configs/ZUMA.h | 8 -------- include/configs/a4m072.h | 3 --- include/configs/aev.h | 3 --- include/configs/alpr.h | 8 -------- include/configs/aria.h | 8 -------- include/configs/atc.h | 8 -------- include/configs/barco.h | 9 --------- include/configs/c2mon.h | 9 --------- include/configs/canmb.h | 3 --- include/configs/cm5200.h | 3 --- include/configs/cmi_mpc5xx.h | 9 --------- include/configs/cogent_mpc8260.h | 9 --------- include/configs/cogent_mpc8xx.h | 9 --------- include/configs/corenet_ds.h | 8 -------- include/configs/cpci5200.h | 3 --- include/configs/csb272.h | 9 --------- include/configs/csb472.h | 9 --------- include/configs/debris.h | 10 ---------- include/configs/digsy_mtc.h | 3 --- include/configs/eXalion.h | 10 ---------- include/configs/ep8248.h | 3 --- include/configs/ep8260.h | 8 -------- include/configs/ep82xxm.h | 3 --- include/configs/galaxy5200.h | 2 -- include/configs/gw8260.h | 9 --------- include/configs/hermes.h | 9 --------- include/configs/hmi1001.h | 3 --- include/configs/hymod.h | 8 -------- include/configs/inka4x0.h | 3 --- include/configs/ipek01.h | 3 --- include/configs/jupiter.h | 3 --- include/configs/km8xx.h | 8 -------- include/configs/kmeter1.h | 8 -------- include/configs/korat.h | 8 -------- include/configs/kvme080.h | 3 --- include/configs/linkstation.h | 8 -------- include/configs/lwmon.h | 8 -------- include/configs/lwmon5.h | 8 -------- include/configs/manroland/common.h | 3 --- include/configs/mcc200.h | 3 --- include/configs/mecp5123.h | 8 -------- include/configs/mecp5200.h | 3 --- include/configs/mgcoge.h | 3 --- include/configs/motionpro.h | 3 --- include/configs/mpc5121ads.h | 8 -------- include/configs/mpc7448hpc2.h | 8 -------- include/configs/mpc8308_p1m.h | 8 -------- include/configs/muas3001.h | 3 --- include/configs/munices.h | 2 -- include/configs/o2dnt.h | 3 --- include/configs/p3mx.h | 8 -------- include/configs/p3p440.h | 8 -------- include/configs/pcm030.h | 2 -- include/configs/pcs440ep.h | 8 -------- include/configs/pdm360ng.h | 8 -------- include/configs/pf5200.h | 3 --- include/configs/ppmc7xx.h | 12 ------------ include/configs/ppmc8260.h | 9 --------- include/configs/quantum.h | 8 -------- include/configs/rmu.h | 8 -------- include/configs/rsdproto.h | 8 -------- include/configs/sacsng.h | 8 -------- include/configs/sbc405.h | 8 -------- include/configs/sbc8240.h | 8 -------- include/configs/sbc8260.h | 9 --------- include/configs/sbc8349.h | 8 -------- include/configs/sbc8548.h | 8 -------- include/configs/sbc8560.h | 8 -------- include/configs/sbc8641d.h | 8 -------- include/configs/sc3.h | 8 -------- include/configs/socrates.h | 8 -------- include/configs/sorcery.h | 3 --- include/configs/spc1920.h | 8 -------- include/configs/spieval.h | 3 --- include/configs/stxgp3.h | 8 -------- include/configs/stxssa.h | 8 -------- include/configs/stxxtc.h | 8 -------- include/configs/svm_sc8xx.h | 9 --------- include/configs/uc100.h | 8 -------- include/configs/utx8245.h | 9 --------- include/configs/v37.h | 8 -------- include/configs/v38b.h | 3 --- include/configs/ve8313.h | 8 -------- include/configs/virtlab2.h | 9 --------- include/configs/vme8349.h | 8 -------- include/configs/zeus.h | 8 -------- 287 files changed, 11 insertions(+), 2082 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
On Tue, 14 Sep 2010 19:13:50 -0500 Peter Tyser ptyser@xes-inc.com wrote:
This change lays the groundwork for the BOOTFLAG_* flags being removed.
This change has the small affect of delaying 100ms on PCI initialization after a warm boot as opposed to the optimal 1ms on some boards.
Signed-off-by: Peter Tyser ptyser@xes-inc.com CC: kim.phillips@freescale.com
arch/powerpc/cpu/mpc83xx/pci.c | 6 +++--- arch/powerpc/cpu/mpc83xx/pcie.c | 6 +++--- board/esd/vme8349/pci.c | 2 +- board/freescale/mpc8308rdb/mpc8308rdb.c | 2 +- board/freescale/mpc8313erdb/mpc8313erdb.c | 8 +------- board/freescale/mpc8315erdb/mpc8315erdb.c | 8 ++------ board/freescale/mpc8323erdb/mpc8323erdb.c | 2 +- board/freescale/mpc832xemds/pci.c | 6 +++--- board/freescale/mpc8349emds/pci.c | 6 +++--- board/freescale/mpc8349itx/pci.c | 4 ++-- board/freescale/mpc8360emds/pci.c | 6 +++--- board/freescale/mpc8360erdk/mpc8360erdk.c | 2 +- board/freescale/mpc837xemds/pci.c | 2 +- board/freescale/mpc837xerdb/pci.c | 4 ++-- board/matrix_vision/mvblm7/pci.c | 5 +---- board/sbc8349/pci.c | 2 +- board/sheldon/simpc8313/simpc8313.c | 5 +---- board/tqc/tqm834x/pci.c | 2 +- board/ve8313/ve8313.c | 5 +---- include/mpc83xx.h | 4 ++-- 20 files changed, 34 insertions(+), 53 deletions(-)
applied to u-boot-mpc83xx/next, with the following added due to account for the new board:
diff --git a/board/mpc8308_p1m/mpc8308_p1m.c b/board/mpc8308_p1m/mpc8308_p1m.c index 0c70b15..d92833b 100644 --- a/board/mpc8308_p1m/mpc8308_p1m.c +++ b/board/mpc8308_p1m/mpc8308_p1m.c @@ -74,7 +74,7 @@ void pci_init_board(void) out_be32(&pcie_law[0].bar, CONFIG_SYS_PCIE1_BASE & LAWBAR_BAR); out_be32(&pcie_law[0].ar, LBLAWAR_EN | LBLAWAR_512MB);
- mpc83xx_pcie_init(1, pcie_reg, 0); + mpc83xx_pcie_init(1, pcie_reg); }
#if defined(CONFIG_OF_BOARD_SETUP)
Thanks,
Kim
n.b., if this was part of a series that was to be applied in whole by one maintainer, please state that up front. I decided to apply this since (a) it needed rebasing for the new board, and (b) it's the 1st in the series, and git will automatically merge it for that single maintainer come apply time.
participants (3)
-
Kim Phillips -
Peter Tyser -
Wolfgang Denk