Commit 0151d99d74ec4b8a33133acf94ebcd25d717dfd7
Committed by
York Sun
York Sun
1 parent
7cb4f1cc80
Exists in
master
and in
53 other branches
powerpc: deleted unused symbol CONFIG_SPL_NAND_MINIMAL and enabled some functionality for common SPL
1. The symbol CONFIG_SPL_NAND_MINIMAL is unused, so deleted it. 2. Some functions were unused in the minimal SPL, but it is useful in the common SPL. So, enabled some functionality for common SPL. Signed-off-by: Ying Zhang <b40530@freescale.com> Acked-by: York Sun <yorksun@freescale.com>
Showing 5 changed files with 6 additions and 6 deletions Side-by-side Diff
arch/powerpc/cpu/mpc85xx/tlb.c
| ... | ... | @@ -39,7 +39,8 @@ |
| 39 | 39 | return ; |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | -#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD) | |
| 42 | +#if !defined(CONFIG_NAND_SPL) && \ | |
| 43 | + (!defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL_INIT_MINIMAL)) | |
| 43 | 44 | void read_tlbcam_entry(int idx, u32 *valid, u32 *tsize, unsigned long *epn, |
| 44 | 45 | phys_addr_t *rpn) |
| 45 | 46 | { |
arch/powerpc/cpu/mpc8xxx/law.c
| ... | ... | @@ -76,7 +76,8 @@ |
| 76 | 76 | return; |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | -#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD) | |
| 79 | +#if !defined(CONFIG_NAND_SPL) && \ | |
| 80 | + (!defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL_INIT_MINIMAL)) | |
| 80 | 81 | static int get_law_entry(u8 i, struct law_entry *e) |
| 81 | 82 | { |
| 82 | 83 | u32 lawar; |
| ... | ... | @@ -106,7 +107,8 @@ |
| 106 | 107 | return idx; |
| 107 | 108 | } |
| 108 | 109 | |
| 109 | -#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD) | |
| 110 | +#if !defined(CONFIG_NAND_SPL) && \ | |
| 111 | + (!defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL_INIT_MINIMAL)) | |
| 110 | 112 | int set_last_law(phys_addr_t addr, enum law_size sz, enum law_trgt_if id) |
| 111 | 113 | { |
| 112 | 114 | u32 idx; |
include/configs/MPC8313ERDB.h
| ... | ... | @@ -24,7 +24,6 @@ |
| 24 | 24 | #define CONFIG_SPL_INIT_MINIMAL |
| 25 | 25 | #define CONFIG_SPL_SERIAL_SUPPORT |
| 26 | 26 | #define CONFIG_SPL_NAND_SUPPORT |
| 27 | -#define CONFIG_SPL_NAND_MINIMAL | |
| 28 | 27 | #define CONFIG_SPL_FLUSH_IMAGE |
| 29 | 28 | #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" |
| 30 | 29 | #define CONFIG_SPL_MPC83XX_WAIT_FOR_NAND |
include/configs/P1022DS.h
include/configs/p1_p2_rdb_pc.h