Skip to contentSkip to conversation

85xx: Remove unused CONFIG_ASSUME_AMD_FLASH from config files

PATCH New Becky Bruce 3 participants 5 messages Nov 5, 2009 – Dec 4, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 85xx: Remove unused CONFIG_ASSUME_AMD_FLASH from config files

A bunch of the 85xx boards have this cruft in them - it's not used anywhere. Delete it.

---
 include/configs/MPC8536DS.h  |    7 -------
 include/configs/MPC8541CDS.h |    7 -------
 include/configs/MPC8544DS.h  |    7 -------
 include/configs/MPC8548CDS.h |    7 -------
 include/configs/MPC8555CDS.h |    7 -------
 include/configs/MPC8568MDS.h |    7 -------
 include/configs/MPC8569MDS.h |    7 -------
 include/configs/MPC8572DS.h  |    7 -------
 include/configs/P2020DS.h    |    7 -------
 9 files changed, 0 insertions(+), 63 deletions(-)
include/configs/MPC8536DS.h +0 -7
index a847275..46d6e9d 100644
@@ -70,13 +70,6 @@
 #define CONFIG_TSEC_ENET		/* tsec ethernet support */
 #define CONFIG_ENV_OVERWRITE
 
-/*
- * When initializing flash, if we cannot find the manufacturer ID,
- * assume this is the AMD flash associated with the CDS board.
- * This allows booting from a promjet.
- */
-#define CONFIG_ASSUME_AMD_FLASH
-
 #ifndef __ASSEMBLY__
 extern unsigned long get_board_sys_clk(unsigned long dummy);
 extern unsigned long get_board_ddr_clk(unsigned long dummy);
include/configs/MPC8541CDS.h +0 -7
index a8f206f..f41fe30 100644
@@ -46,13 +46,6 @@
 
 #define CONFIG_FSL_VIA
 
-/*
- * When initializing flash, if we cannot find the manufacturer ID,
- * assume this is the AMD flash associated with the CDS board.
- * This allows booting from a promjet.
- */
-#define CONFIG_ASSUME_AMD_FLASH
-
 #ifndef __ASSEMBLY__
 extern unsigned long get_clock_freq(void);
 #endif
include/configs/MPC8544DS.h +0 -7
index 0caf456..b7d3553 100644
@@ -50,13 +50,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_INTERRUPTS		/* enable pci, srio, ddr interrupts */
 
-/*
- * When initializing flash, if we cannot find the manufacturer ID,
- * assume this is the AMD flash associated with the CDS board.
- * This allows booting from a promjet.
- */
-#define CONFIG_ASSUME_AMD_FLASH
-
 #ifndef __ASSEMBLY__
 extern unsigned long get_board_sys_clk(unsigned long dummy);
 #endif
include/configs/MPC8548CDS.h +0 -7
index e69ba90..53de56d 100644
@@ -52,13 +52,6 @@
 
 #define CONFIG_FSL_VIA
 
-/*
- * When initializing flash, if we cannot find the manufacturer ID,
- * assume this is the AMD flash associated with the CDS board.
- * This allows booting from a promjet.
- */
-#define CONFIG_ASSUME_AMD_FLASH
-
 #ifndef __ASSEMBLY__
 extern unsigned long get_clock_freq(void);
 #endif
include/configs/MPC8555CDS.h +0 -7
index 94952dc..abbfd47 100644
@@ -46,13 +46,6 @@
 #define CONFIG_FSL_VIA
 
 
-/*
- * When initializing flash, if we cannot find the manufacturer ID,
- * assume this is the AMD flash associated with the CDS board.
- * This allows booting from a promjet.
- */
-#define CONFIG_ASSUME_AMD_FLASH
-
 #ifndef __ASSEMBLY__
 extern unsigned long get_clock_freq(void);
 #endif
include/configs/MPC8568MDS.h +0 -7
index 7b8c6c7..426b933 100644
@@ -44,13 +44,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_FSL_LAW		1	/* Use common FSL init code */
 
-/*
- * When initializing flash, if we cannot find the manufacturer ID,
- * assume this is the AMD flash associated with the MDS board.
- * This allows booting from a promjet.
- */
-#define CONFIG_ASSUME_AMD_FLASH
-
 #ifndef __ASSEMBLY__
 extern unsigned long get_clock_freq(void);
 #endif						  /*Replace a call to get_clock_freq (after it is implemented)*/
include/configs/MPC8569MDS.h +0 -7
index 17ea3bb..b87f375 100644
@@ -44,13 +44,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_FSL_LAW		1	/* Use common FSL init code */
 
-/*
- * When initializing flash, if we cannot find the manufacturer ID,
- * assume this is the AMD flash associated with the MDS board.
- * This allows booting from a promjet.
- */
-#define CONFIG_ASSUME_AMD_FLASH
-
 #ifndef __ASSEMBLY__
 extern unsigned long get_clock_freq(void);
 #endif
include/configs/MPC8572DS.h +0 -7
index 000f8f6..0e7745c 100644
@@ -53,13 +53,6 @@
 #define CONFIG_TSEC_ENET		/* tsec ethernet support */
 #define CONFIG_ENV_OVERWRITE
 
-/*
- * When initializing flash, if we cannot find the manufacturer ID,
- * assume this is the AMD flash associated with the CDS board.
- * This allows booting from a promjet.
- */
-#define CONFIG_ASSUME_AMD_FLASH
-
 #ifndef __ASSEMBLY__
 extern unsigned long get_board_sys_clk(unsigned long dummy);
 extern unsigned long get_board_ddr_clk(unsigned long dummy);
include/configs/P2020DS.h +0 -7
index b48c199..9574fca 100644
@@ -54,13 +54,6 @@
 #define CONFIG_TSEC_ENET		/* tsec ethernet support */
 #define CONFIG_ENV_OVERWRITE
 
-/*
- * When initializing flash, if we cannot find the manufacturer ID,
- * assume this is the AMD flash associated with the CDS board.
- * This allows booting from a promjet.
- */
-#define CONFIG_ASSUME_AMD_FLASH
-
 #ifndef __ASSEMBLY__
 extern unsigned long calculate_board_sys_clk(unsigned long dummy);
 extern unsigned long calculate_board_ddr_clk(unsigned long dummy);
Signature · 1 line
1.6.0.6
Applied
#1 lore raw

PATCH 1/1 85xx: Remove unused CONFIG_ASSUME_AMD_FLASH from config files

Quoted 5 lines · Becky Bruce

A bunch of the 85xx boards have this cruft in them - it's not used anywhere. Delete it.

---

Quoted 10 lines
include/configs/MPC8536DS.h  |    7 -------
include/configs/MPC8541CDS.h |    7 -------
include/configs/MPC8544DS.h  |    7 -------
include/configs/MPC8548CDS.h |    7 -------
include/configs/MPC8555CDS.h |    7 -------
include/configs/MPC8568MDS.h |    7 -------
include/configs/MPC8569MDS.h |    7 -------
include/configs/MPC8572DS.h  |    7 -------
include/configs/P2020DS.h    |    7 -------
9 files changed, 0 insertions(+), 63 deletions(-)

applied to 85xx next branch.

- k

#2 lore raw

PATCH 1/1 85xx: Remove unused CONFIG_ASSUME_AMD_FLASH from config files

In reply to Becky Bruce

Dear Becky Bruce,

Quoted 4 lines · In message <[email protected]> you…

A bunch of the 85xx boards have this cruft in them - it's not used anywhere. Delete it.

Quoted 11 lines
---
 include/configs/MPC8536DS.h  |    7 -------
 include/configs/MPC8541CDS.h |    7 -------
 include/configs/MPC8544DS.h  |    7 -------
 include/configs/MPC8548CDS.h |    7 -------
 include/configs/MPC8555CDS.h |    7 -------
 include/configs/MPC8568MDS.h |    7 -------
 include/configs/MPC8569MDS.h |    7 -------
 include/configs/MPC8572DS.h  |    7 -------
 include/configs/P2020DS.h    |    7 -------
 9 files changed, 0 insertions(+), 63 deletions(-)

Applied, thanks.

Andy/Kumar: I hope it's OK with you that I take this directky.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Too much of anything, even love, isn't necessarily a good thing.
	-- Kirk, "The Trouble with Tribbles", stardate 4525.6
#3 lore raw

PATCH 1/1 85xx: Remove unused CONFIG_ASSUME_AMD_FLASH from config files

Quoted 20 lines · Wolfgang Denk

Dear Becky Bruce,

In message <[email protected]

Quoted 6 lines

you wrote:
A bunch of the 85xx boards have this cruft in them - it's not used anywhere. Delete it.

---

Quoted 10 lines
include/configs/MPC8536DS.h  |    7 -------
include/configs/MPC8541CDS.h |    7 -------
include/configs/MPC8544DS.h  |    7 -------
include/configs/MPC8548CDS.h |    7 -------
include/configs/MPC8555CDS.h |    7 -------
include/configs/MPC8568MDS.h |    7 -------
include/configs/MPC8569MDS.h |    7 -------
include/configs/MPC8572DS.h  |    7 -------
include/configs/P2020DS.h    |    7 -------
9 files changed, 0 insertions(+), 63 deletions(-)
Quoted 7 lines

Applied, thanks.

Andy/Kumar: I hope it's OK with you that I take this directky.

Best regards,

Wolfgang Denk

no issue, will drop it from my 'next' branch.

- k

#4 lore raw

PATCH 1/1 85xx: Remove unused CONFIG_ASSUME_AMD_FLASH from config files

Dear Kumar Gala,

Quoted 2 lines · In message <[email protected]> you wrote:
Quoted 2 lines

Andy/Kumar: I hope it's OK with you that I take this directky.

...

Quoted 1 line

no issue, will drop it from my 'next' branch.

You don't really have to - git will sort this out.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Was hei?t Windows auf Indianisch? - "Wei?er  Mann,  der  auf  Sanduhr
wartet!"