ppc: Conditionally compile bat_rw.c
PATCH 1/1 ppc: Conditionally compile bat_rw.c
Only a few PPC boards actually use the common BAT manipulation functions, so only compile it for them.
--- arch/powerpc/lib/Makefile | 2 +- include/configs/Alaska8220.h | 1 + include/configs/MPC8610HPCD.h | 1 + include/configs/MPC8641HPCN.h | 1 + include/configs/Yukon8220.h | 1 + include/configs/sbc8641d.h | 1 + include/configs/xpedite517x.h | 1 + 7 files changed, 7 insertions(+), 1 deletions(-)
arch/powerpc/lib/Makefile +1 -1
@@ -30,7 +30,7 @@ SOBJS-y += ppcstring.o SOBJS-y += ticks.o SOBJS-y += reloc.o -COBJS-y += bat_rw.o +COBJS-$(CONFIG_BAT_RW) += bat_rw.o COBJS-y += board.o COBJS-y += bootm.o COBJS-$(CONFIG_BOOTCOUNT_LIMIT) += bootcount.o
include/configs/Alaska8220.h +1 -0
@@ -31,6 +31,7 @@#define CONFIG_MPC8220 1#define CONFIG_ALASKA8220 1/* ... on Alaska board */ +#define CONFIG_BAT_RW 1/* Use common BAT rw code */ #define CONFIG_HIGH_BATS 1/* High BATs supported */ /* Input clock running at 30Mhz, read Hid1 for the CPU multiplier to
include/configs/MPC8610HPCD.h +1 -0
@@ -53,6 +53,7 @@#define CONFIG_ENV_OVERWRITE #define CONFIG_INTERRUPTS /* enable pci, srio, ddr interrupts */ +#define CONFIG_BAT_RW 1/* Use common BAT rw code */ #define CONFIG_HIGH_BATS 1/* High BATs supported & enabled */ #define CONFIG_ALTIVEC 1
include/configs/MPC8641HPCN.h +1 -0
@@ -68,6 +68,7 @@#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE +#define CONFIG_BAT_RW 1/* Use common BAT rw code */ #define CONFIG_HIGH_BATS 1/* High BATs supported and enabled */ #define CONFIG_SYS_NUM_ADDR_MAP 8/* Number of addr map slots = 8 dbats */
include/configs/Yukon8220.h +1 -0
@@ -31,6 +31,7 @@#define CONFIG_MPC8220 1#define CONFIG_YUKON8220 1/* ... on Yukon board */ +#define CONFIG_BAT_RW 1/* Use common BAT rw code */ #define CONFIG_HIGH_BATS 1/* High BATs supported */ /* Input clock running at 30Mhz, read Hid1 for the CPU multiplier to
include/configs/sbc8641d.h +1 -0
@@ -64,6 +64,7 @@#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE +#define CONFIG_BAT_RW 1/* Use common BAT rw code */ #define CONFIG_HIGH_BATS 1/* High BATs supported and enabled */ #undef CONFIG_SPD_EEPROM/* Do not use SPD EEPROM for DDR setup*/
include/configs/xpedite517x.h +1 -0
@@ -37,6 +37,7 @@#define CONFIG_SYS_FORM_3U_VPX 1#define CONFIG_LINUX_RESET_VEC 0x100/* Reset vector used by Linux */ #define CONFIG_BOARD_EARLY_INIT_R /* Call board_pre_init */ +#define CONFIG_BAT_RW 1/* Use common BAT rw code */ #define CONFIG_HIGH_BATS 1/* High BATs supported and enabled */ #define CONFIG_ALTIVEC 1
Signature · 1 line
1.7.0.4
PATCH 1/1 ppc: Conditionally compile bat_rw.c
Dear Peter Tyser,
Quoted 4 lines · In message <[email protected]> you wrote:
Only a few PPC boards actually use the common BAT manipulation functions, so only compile it for them.
Signed-off-by Peter Tyser <[email protected]>
Quoted 9 lines
--- arch/powerpc/lib/Makefile | 2 +- include/configs/Alaska8220.h | 1 + include/configs/MPC8610HPCD.h | 1 + include/configs/MPC8641HPCN.h | 1 + include/configs/Yukon8220.h | 1 + include/configs/sbc8641d.h | 1 + include/configs/xpedite517x.h | 1 + 7 files changed, 7 insertions(+), 1 deletions(-)
Sorry, but this does not apply:
Applying: ppc: Conditionally compile bat_rw.c
fatal: sha1 information is lacking or useless (include/configs/xpedite517x.h).
Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge.
Patch failed at 0001 ppc: Conditionally compile bat_rw.c
Best regards,
Wolfgang Denk
Signature · 6 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 Where a calculator on the ENIAC is equipped with 18,000 vacuum tubes and weighs 30 tons, computers in the future may have only 1,000 vacuum tubes and weigh only 1/2 tons. - Popular Mechanics, March 1949
PATCH v2 1/1 ppc: Conditionally compile bat_rw.c
In reply to Peter TyserOnly a few PPC boards actually use the common BAT manipulation functions, so only compile it for them.
---
Changes since v1:
- Rebased on current top of tree
arch/powerpc/lib/Makefile | 2 +- include/configs/Alaska8220.h | 1 + include/configs/MPC8610HPCD.h | 1 + include/configs/MPC8641HPCN.h | 1 + include/configs/XPEDITE5170.h | 1 + include/configs/Yukon8220.h | 1 + include/configs/sbc8641d.h | 1 + 7 files changed, 7 insertions(+), 1 deletions(-)
arch/powerpc/lib/Makefile +1 -1
@@ -30,7 +30,7 @@ SOBJS-y += ppcstring.o SOBJS-y += ticks.o SOBJS-y += reloc.o -COBJS-y += bat_rw.o +COBJS-$(CONFIG_BAT_RW) += bat_rw.o COBJS-y += board.o COBJS-y += bootm.o COBJS-$(CONFIG_BOOTCOUNT_LIMIT) += bootcount.o
include/configs/Alaska8220.h +1 -0
@@ -31,6 +31,7 @@#define CONFIG_MPC8220 1#define CONFIG_ALASKA8220 1/* ... on Alaska board */ +#define CONFIG_BAT_RW 1/* Use common BAT rw code */ #define CONFIG_HIGH_BATS 1/* High BATs supported */ /* Input clock running at 30Mhz, read Hid1 for the CPU multiplier to
include/configs/MPC8610HPCD.h +1 -0
@@ -53,6 +53,7 @@#define CONFIG_ENV_OVERWRITE #define CONFIG_INTERRUPTS /* enable pci, srio, ddr interrupts */ +#define CONFIG_BAT_RW 1/* Use common BAT rw code */ #define CONFIG_HIGH_BATS 1/* High BATs supported & enabled */ #define CONFIG_ALTIVEC 1
include/configs/MPC8641HPCN.h +1 -0
@@ -68,6 +68,7 @@#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE +#define CONFIG_BAT_RW 1/* Use common BAT rw code */ #define CONFIG_HIGH_BATS 1/* High BATs supported and enabled */ #define CONFIG_SYS_NUM_ADDR_MAP 8/* Number of addr map slots = 8 dbats */
include/configs/XPEDITE5170.h +1 -0
@@ -36,6 +36,7 @@#define CONFIG_SYS_BOARD_NAME "XPedite5170"#define CONFIG_LINUX_RESET_VEC 0x100/* Reset vector used by Linux */ #define CONFIG_BOARD_EARLY_INIT_R /* Call board_pre_init */ +#define CONFIG_BAT_RW 1/* Use common BAT rw code */ #define CONFIG_HIGH_BATS 1/* High BATs supported and enabled */ #define CONFIG_ALTIVEC 1
include/configs/Yukon8220.h +1 -0
@@ -31,6 +31,7 @@#define CONFIG_MPC8220 1#define CONFIG_YUKON8220 1/* ... on Yukon board */ +#define CONFIG_BAT_RW 1/* Use common BAT rw code */ #define CONFIG_HIGH_BATS 1/* High BATs supported */ /* Input clock running at 30Mhz, read Hid1 for the CPU multiplier to
include/configs/sbc8641d.h +1 -0
@@ -64,6 +64,7 @@#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE +#define CONFIG_BAT_RW 1/* Use common BAT rw code */ #define CONFIG_HIGH_BATS 1/* High BATs supported and enabled */ #undef CONFIG_SPD_EEPROM/* Do not use SPD EEPROM for DDR setup*/
Signature · 1 line
1.7.1.13.gcfb88
Wolfgang Denk
AppliedPATCH v2 1/1 ppc: Conditionally compile bat_rw.c
Dear Peter Tyser,
Quoted 8 lines · In message <[email protected]> you wrote:
Only a few PPC boards actually use the common BAT manipulation functions, so only compile it for them.
Signed-off-by Peter Tyser <[email protected]>---
Changes since v1:
- Rebased on current top of tree
Quoted 8 lines
arch/powerpc/lib/Makefile | 2 +- include/configs/Alaska8220.h | 1 + include/configs/MPC8610HPCD.h | 1 + include/configs/MPC8641HPCN.h | 1 + include/configs/XPEDITE5170.h | 1 + include/configs/Yukon8220.h | 1 + include/configs/sbc8641d.h | 1 + 7 files changed, 7 insertions(+), 1 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 9 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 'What shall we do?' said Twoflower. 'Panic?' said Rincewind hope- fully. He always held that panic was the best means of survival; back in the olden days, his theory went, people faced with hungry sabre- toothed tigers could be divided very simply in those who panicked and those who stood there saying 'What a magnificent brute!' or 'Here, pussy.' - Terry Pratchett, _The Light Fantastic_