Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 7ffe3cd62e5af2cda1e18c6d896cab58bfb0c811

Authored by Robert P. J. Day
Committed by Tom Rini
1 parent 87861c1970
Exists in v2017.01-smarct4x and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2017.01-smarct3x, v2017.01-smarct3x-emmc

Delete tests of CONFIG_OF_LIBFDT when testing CONFIG_OF_BOARD_SETUP 

Since CONFIG_OF_BOARD_SETUP depends on CONFIG_OF_LIBFDT:

  config OF_BOARD_SETUP
          bool "Set up board-specific details in device tree before boot"
          depends on OF_LIBFDT
          ...

remove superfluous tests of CONFIG_OF_LIBFDT when testing for
CONFIG_OF_BOARD_SETUP.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
[trini: Typo fix: s/ifdefi/ifdef/]
Signed-off-by: Tom Rini <trini@konsulko.com>

Showing 27 changed files with 58 additions and 58 deletions Side-by-side Diff

arch/nios2/cpu/fdt.c
Diff comments   View file @ 7ffe3cd
... ... @@ -12,7 +12,7 @@
12 12  
13 13 #include <common.h>
14 14  
15   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  15 +#ifdef CONFIG_OF_BOARD_SETUP
16 16 #include <libfdt.h>
17 17 #include <fdt_support.h>
18 18  
... ... @@ -35,5 +35,5 @@
35 35 */
36 36 fdt_fixup_ethernet(blob);
37 37 }
38   -#endif /* CONFIG_OF_LIBFDT && CONFIG_OF_BOARD_SETUP */
  38 +#endif /* CONFIG_OF_BOARD_SETUP */
arch/powerpc/cpu/mpc5xxx/cpu.c
Diff comments   View file @ 7ffe3cd
... ... @@ -96,7 +96,7 @@
96 96  
97 97 /* ------------------------------------------------------------------------- */
98 98  
99   -#if defined(CONFIG_OF_LIBFDT) && defined (CONFIG_OF_BOARD_SETUP)
  99 +#ifdef CONFIG_OF_BOARD_SETUP
100 100 void ft_cpu_setup(void *blob, bd_t *bd)
101 101 {
102 102 int div = in_8((void*)CONFIG_SYS_MBAR + 0x204) & 0x0020 ? 8 : 4;
... ... @@ -117,7 +117,7 @@
117 117 do_fixup_by_path(blob, eth_path, "mac-address", enetaddr, 6, 0);
118 118 do_fixup_by_path(blob, eth_path, "local-mac-address", enetaddr, 6, 0);
119 119 #endif
120   -#if defined(CONFIG_OF_IDE_FIXUP)
  120 +#ifdef CONFIG_OF_IDE_FIXUP
121 121 if (!ide_device_present(0)) {
122 122 /* NO CF card detected -> delete ata node in DTS */
123 123 int nodeoffset = 0;
124 124  
... ... @@ -132,10 +132,10 @@
132 132 }
133 133 }
134 134  
135   -#endif
  135 +#endif /* CONFIG_OF_IDE_FIXUP */
136 136 fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
137 137 }
138   -#endif
  138 +#endif /* CONFIG_OF_BOARD_SETUP */
139 139  
140 140 #ifdef CONFIG_MPC5xxx_FEC
141 141 /* Default initializations for FEC controllers. To override,
arch/powerpc/cpu/mpc8260/cpu.c
Diff comments   View file @ 7ffe3cd
... ... @@ -284,7 +284,7 @@
284 284 #endif /* CONFIG_WATCHDOG */
285 285  
286 286 /* ------------------------------------------------------------------------- */
287   -#if defined(CONFIG_OF_LIBFDT) && defined (CONFIG_OF_BOARD_SETUP)
  287 +#ifdef CONFIG_OF_BOARD_SETUP
288 288 void ft_cpu_setup (void *blob, bd_t *bd)
289 289 {
290 290 #if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) ||\
... ... @@ -303,7 +303,7 @@
303 303 "clock-frequency", bd->bi_intfreq, 1);
304 304 fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
305 305 }
306   -#endif /* CONFIG_OF_LIBFDT */
  306 +#endif /* CONFIG_OF_BOARD_SETUP */
307 307  
308 308 /*
309 309 * Initializes on-chip ethernet controllers.
arch/powerpc/cpu/ppc4xx/fdt.c
Diff comments   View file @ 7ffe3cd
... ... @@ -11,7 +11,7 @@
11 11 #include <asm/cache.h>
12 12 #include <asm/ppc4xx.h>
13 13  
14   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  14 +#ifdef CONFIG_OF_BOARD_SETUP
15 15 #include <libfdt.h>
16 16 #include <fdt_support.h>
17 17 #include <asm/4xx_pcie.h>
... ... @@ -160,5 +160,5 @@
160 160 */
161 161 fdt_pcie_setup(blob);
162 162 }
163   -#endif /* CONFIG_OF_LIBFDT && CONFIG_OF_BOARD_SETUP */
  163 +#endif /* CONFIG_OF_BOARD_SETUP */
board/a3m071/a3m071.c
Diff comments   View file @ 7ffe3cd
... ... @@ -391,14 +391,14 @@
391 391 return 0;
392 392 }
393 393  
394   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  394 +#ifdef CONFIG_OF_BOARD_SETUP
395 395 int ft_board_setup(void *blob, bd_t *bd)
396 396 {
397 397 ft_cpu_setup(blob, bd);
398 398  
399 399 return 0;
400 400 }
401   -#endif /* defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP) */
  401 +#endif /* CONFIG_OF_BOARD_SETUP */
402 402  
403 403 #ifdef CONFIG_SPL_OS_BOOT
404 404 /*
board/a4m072/a4m072.c
Diff comments   View file @ 7ffe3cd
... ... @@ -170,14 +170,14 @@
170 170 }
171 171 #endif
172 172  
173   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  173 +#ifdef CONFIG_OF_BOARD_SETUP
174 174 int ft_board_setup(void *blob, bd_t *bd)
175 175 {
176 176 ft_cpu_setup(blob, bd);
177 177  
178 178 return 0;
179 179 }
180   -#endif
  180 +#endif /* CONFIG_OF_BOARD_SETUP */
181 181  
182 182 int board_eth_init(bd_t *bis)
183 183 {
board/amcc/canyonlands/canyonlands.c
Diff comments   View file @ 7ffe3cd
... ... @@ -489,7 +489,7 @@
489 489 }
490 490 #endif /* !defined(CONFIG_ARCHES) */
491 491  
492   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  492 +#ifdef CONFIG_OF_BOARD_SETUP
493 493 extern int __ft_board_setup(void *blob, bd_t *bd);
494 494  
495 495 int ft_board_setup(void *blob, bd_t *bd)
... ... @@ -518,5 +518,5 @@
518 518  
519 519 return 0;
520 520 }
521   -#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
  521 +#endif /* CONFIG_OF_BOARD_SETUP */
board/cm5200/cm5200.c
Diff comments   View file @ 7ffe3cd
... ... @@ -237,7 +237,7 @@
237 237 }
238 238  
239 239  
240   -#if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
  240 +#ifdef CONFIG_OF_BOARD_SETUP
241 241 /*
242 242 * Update 'model' and 'memory' properties in the blob according to the module
243 243 * that we are running on.
... ... @@ -255,7 +255,7 @@
255 255 printf("ft_blob_update(): cannot set /model property err:%s\n",
256 256 fdt_strerror(ret));
257 257 }
258   -#endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */
  258 +#endif /* CONFIG_OF_BOARD_SETUP */
259 259  
260 260  
261 261 /*
... ... @@ -358,7 +358,7 @@
358 358 #endif /* CONFIG_LAST_STAGE_INIT */
359 359  
360 360  
361   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  361 +#ifdef CONFIG_OF_BOARD_SETUP
362 362 int ft_board_setup(void *blob, bd_t *bd)
363 363 {
364 364 ft_cpu_setup(blob, bd);
... ... @@ -366,5 +366,5 @@
366 366  
367 367 return 0;
368 368 }
369   -#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
  369 +#endif /* CONFIG_OF_BOARD_SETUP */
board/davedenx/aria/aria.c
Diff comments   View file @ 7ffe3cd
... ... @@ -106,12 +106,12 @@
106 106 return 0;
107 107 }
108 108  
109   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  109 +#ifdef CONFIG_OF_BOARD_SETUP
110 110 int ft_board_setup(void *blob, bd_t *bd)
111 111 {
112 112 ft_cpu_setup(blob, bd);
113 113  
114 114 return 0;
115 115 }
116   -#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
  116 +#endif /* CONFIG_OF_BOARD_SETUP */
board/esd/cpci405/cpci405.c
Diff comments   View file @ 7ffe3cd
... ... @@ -471,7 +471,7 @@
471 471 }
472 472 #endif /* defined(CONFIG_PCI) */
473 473  
474   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  474 +#ifdef CONFIG_OF_BOARD_SETUP
475 475 int ft_board_setup(void *blob, bd_t *bd)
476 476 {
477 477 int rc;
... ... @@ -493,5 +493,5 @@
493 493  
494 494 return 0;
495 495 }
496   -#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
  496 +#endif /* CONFIG_OF_BOARD_SETUP */
board/esd/mecp5123/mecp5123.c
Diff comments   View file @ 7ffe3cd
... ... @@ -198,12 +198,12 @@
198 198 return 0;
199 199 }
200 200  
201   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  201 +#ifdef CONFIG_OF_BOARD_SETUP
202 202 int ft_board_setup(void *blob, bd_t *bd)
203 203 {
204 204 ft_cpu_setup(blob, bd);
205 205  
206 206 return 0;
207 207 }
208   -#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
  208 +#endif /* CONFIG_OF_BOARD_SETUP */
board/esd/pmc405de/pmc405de.c
Diff comments   View file @ 7ffe3cd
... ... @@ -300,7 +300,7 @@
300 300 return 1;
301 301 }
302 302  
303   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  303 +#ifdef CONFIG_OF_BOARD_SETUP
304 304 int ft_board_setup(void *blob, bd_t *bd)
305 305 {
306 306 int rc;
... ... @@ -322,7 +322,7 @@
322 322  
323 323 return 0;
324 324 }
325   -#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
  325 +#endif /* CONFIG_OF_BOARD_SETUP */
326 326  
327 327 #if defined(CONFIG_SYS_EEPROM_WREN)
328 328 /* Input: <dev_addr> I2C address of EEPROM device to enable.
board/esd/pmc440/pmc440.c
Diff comments   View file @ 7ffe3cd
... ... @@ -882,7 +882,7 @@
882 882 }
883 883 #endif /* defined(CONFIG_USB_OHCI) && defined(CONFIG_SYS_USB_OHCI_BOARD_INIT) */
884 884  
885   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  885 +#ifdef CONFIG_OF_BOARD_SETUP
886 886 int ft_board_setup(void *blob, bd_t *bd)
887 887 {
888 888 int rc;
... ... @@ -903,5 +903,5 @@
903 903  
904 904 return 0;
905 905 }
906   -#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
  906 +#endif /* CONFIG_OF_BOARD_SETUP */
board/freescale/mpc5121ads/mpc5121ads.c
Diff comments   View file @ 7ffe3cd
... ... @@ -274,12 +274,12 @@
274 274 return 0;
275 275 }
276 276  
277   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  277 +#ifdef CONFIG_OF_BOARD_SETUP
278 278 int ft_board_setup(void *blob, bd_t *bd)
279 279 {
280 280 ft_cpu_setup(blob, bd);
281 281  
282 282 return 0;
283 283 }
284   -#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
  284 +#endif /* CONFIG_OF_BOARD_SETUP */
board/gateworks/gw_ventana/gw_ventana.c
Diff comments   View file @ 7ffe3cd
... ... @@ -738,7 +738,7 @@
738 738 return 0;
739 739 }
740 740  
741   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  741 +#ifdef CONFIG_OF_BOARD_SETUP
742 742  
743 743 static int ft_sethdmiinfmt(void *blob, char *mode)
744 744 {
... ... @@ -939,7 +939,7 @@
939 939  
940 940 return 0;
941 941 }
942   -#endif /* defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP) */
  942 +#endif /* CONFIG_OF_BOARD_SETUP */
943 943  
944 944 static struct mxc_serial_platdata ventana_mxc_serial_plat = {
945 945 .reg = (struct mxc_uart *)UART2_BASE,
board/gdsys/intip/intip.c
Diff comments   View file @ 7ffe3cd
... ... @@ -203,7 +203,7 @@
203 203 return 0;
204 204 }
205 205  
206   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  206 +#ifdef CONFIG_OF_BOARD_SETUP
207 207 extern void __ft_board_setup(void *blob, bd_t *bd);
208 208  
209 209 int ft_board_setup(void *blob, bd_t *bd)
... ... @@ -218,5 +218,5 @@
218 218  
219 219 return 0;
220 220 }
221   -#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
  221 +#endif /* CONFIG_OF_BOARD_SETUP */
board/ifm/ac14xx/ac14xx.c
Diff comments   View file @ 7ffe3cd
... ... @@ -607,12 +607,12 @@
607 607 return 0;
608 608 }
609 609  
610   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  610 +#ifdef CONFIG_OF_BOARD_SETUP
611 611 int ft_board_setup(void *blob, bd_t *bd)
612 612 {
613 613 ft_cpu_setup(blob, bd);
614 614  
615 615 return 0;
616 616 }
617   -#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
  617 +#endif /* CONFIG_OF_BOARD_SETUP */
board/ifm/o2dnt2/o2dnt2.c
Diff comments   View file @ 7ffe3cd
... ... @@ -303,7 +303,7 @@
303 303 }
304 304 #endif
305 305  
306   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  306 +#ifdef CONFIG_OF_BOARD_SETUP
307 307 #if defined(CONFIG_SYS_UPDATE_FLASH_SIZE)
308 308 static void ft_adapt_flash_base(void *blob)
309 309 {
... ... @@ -383,5 +383,5 @@
383 383  
384 384 return 0;
385 385 }
386   -#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
  386 +#endif /* CONFIG_OF_BOARD_SETUP */
board/intercontrol/digsy_mtc/digsy_mtc.c
Diff comments   View file @ 7ffe3cd
... ... @@ -378,7 +378,7 @@
378 378 #endif /* CONFIG_IDE_RESET */
379 379 #endif /* CONFIG_CMD_IDE */
380 380  
381   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  381 +#ifdef CONFIG_OF_BOARD_SETUP
382 382 static void ft_delete_node(void *fdt, const char *compat)
383 383 {
384 384 int off = -1;
... ... @@ -481,5 +481,5 @@
481 481  
482 482 return 0;
483 483 }
484   -#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
  484 +#endif /* CONFIG_OF_BOARD_SETUP */
board/ipek01/ipek01.c
Diff comments   View file @ 7ffe3cd
... ... @@ -195,7 +195,7 @@
195 195 }
196 196 #endif
197 197  
198   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  198 +#ifdef CONFIG_OF_BOARD_SETUP
199 199 int ft_board_setup(void *blob, bd_t *bd)
200 200 {
201 201 ft_cpu_setup (blob, bd);
... ... @@ -203,7 +203,7 @@
203 203  
204 204 return 0;
205 205 }
206   -#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
  206 +#endif /* CONFIG_OF_BOARD_SETUP */
207 207  
208 208 int board_eth_init(bd_t *bis)
209 209 {
board/jupiter/jupiter.c
Diff comments   View file @ 7ffe3cd
... ... @@ -282,12 +282,12 @@
282 282 }
283 283 #endif
284 284  
285   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  285 +#ifdef CONFIG_OF_BOARD_SETUP
286 286 int ft_board_setup(void *blob, bd_t *bd)
287 287 {
288 288 ft_cpu_setup(blob, bd);
289 289  
290 290 return 0;
291 291 }
292   -#endif
  292 +#endif /* CONFIG_OF_BOARD_SETUP */
board/motionpro/motionpro.c
Diff comments   View file @ 7ffe3cd
... ... @@ -184,14 +184,14 @@
184 184 }
185 185  
186 186  
187   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  187 +#ifdef CONFIG_OF_BOARD_SETUP
188 188 int ft_board_setup(void *blob, bd_t *bd)
189 189 {
190 190 ft_cpu_setup(blob, bd);
191 191  
192 192 return 0;
193 193 }
194   -#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
  194 +#endif /* CONFIG_OF_BOARD_SETUP */
195 195  
196 196  
197 197 #if defined(CONFIG_STATUS_LED)
board/munices/munices.c
Diff comments   View file @ 7ffe3cd
... ... @@ -145,12 +145,12 @@
145 145 }
146 146 #endif
147 147  
148   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  148 +#ifdef CONFIG_OF_BOARD_SETUP
149 149 int ft_board_setup(void *blob, bd_t *bd)
150 150 {
151 151 ft_cpu_setup(blob, bd);
152 152  
153 153 return 0;
154 154 }
155   -#endif
  155 +#endif /* CONFIG_OF_BOARD_SETUP */
board/pdm360ng/pdm360ng.c
Diff comments   View file @ 7ffe3cd
... ... @@ -429,7 +429,7 @@
429 429 return 0;
430 430 }
431 431  
432   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  432 +#ifdef CONFIG_OF_BOARD_SETUP
433 433 #ifdef CONFIG_FDT_FIXUP_PARTITIONS
434 434 struct node_info nodes[] = {
435 435 { "fsl,mpc5121-nfc", MTD_DEV_TYPE_NAND, },
... ... @@ -529,7 +529,7 @@
529 529  
530 530 return 0;
531 531 }
532   -#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
  532 +#endif /* CONFIG_OF_BOARD_SETUP */
533 533  
534 534 /*
535 535 * If argument is NULL, set the LCD brightness to the
board/phytec/pcm030/pcm030.c
Diff comments   View file @ 7ffe3cd
... ... @@ -163,14 +163,14 @@
163 163 }
164 164 #endif
165 165  
166   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  166 +#ifdef CONFIG_OF_BOARD_SETUP
167 167 int ft_board_setup(void *blob, bd_t *bd)
168 168 {
169 169 ft_cpu_setup(blob, bd);
170 170  
171 171 return 0;
172 172 }
173   -#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
  173 +#endif /* CONFIG_OF_BOARD_SETUP */
174 174  
175 175 #if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
176 176  
board/socrates/socrates.c
Diff comments   View file @ 7ffe3cd
... ... @@ -217,7 +217,7 @@
217 217 }
218 218 #endif /* CONFIG_BOARD_EARLY_INIT_R */
219 219  
220   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  220 +#ifdef CONFIG_OF_BOARD_SETUP
221 221 int ft_board_setup(void *blob, bd_t *bd)
222 222 {
223 223 u32 val[12];
... ... @@ -253,7 +253,7 @@
253 253  
254 254 return 0;
255 255 }
256   -#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
  256 +#endif /* CONFIG_OF_BOARD_SETUP */
257 257  
258 258 #define DEFAULT_BRIGHTNESS 25
259 259 #define BACKLIGHT_ENABLE (1 << 31)
board/ti/ks2_evm/board.c
Diff comments   View file @ 7ffe3cd
... ... @@ -131,7 +131,7 @@
131 131 }
132 132 #endif
133 133  
134   -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
  134 +#ifdef CONFIG_OF_BOARD_SETUP
135 135 int ft_board_setup(void *blob, bd_t *bd)
136 136 {
137 137 int lpae;
... ... @@ -273,5 +273,5 @@
273 273  
274 274 ddr3_check_ecc_int(KS2_DDR3A_EMIF_CTRL_BASE);
275 275 }
276   -#endif
  276 +#endif /* CONFIG_OF_BOARD_SETUP */