Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 0e42ada3107709149b708f6ddc3ad7d9b9017fbb

Authored by Wolfgang Denk
1 parent a9046b9e1a
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, 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-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, 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_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.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-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_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, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

Fix printing of make targets, simplify Makefile 

Make printing the "board names" more useful. So far, we would get
output like this;

$ ./MAKEALL P2020RDB P2020RDB_NAND P2020RDB_SDCARD P2020RDB_SPIFLASH
Configuring for P1_P2_RDB board...
   text    data     bss     dec     hex filename
 342612   32656  265212  640480   9c5e0 /work/wd/tmp-ppc/u-boot
Configuring for P1_P2_RDB board...
   text    data     bss     dec     hex filename
 343160   32704  265212  641076   9c834 /work/wd/tmp-ppc/u-boot
Configuring for P1_P2_RDB board...
   text    data     bss     dec     hex filename
 341908   32620  265212  639740   9c2fc /work/wd/tmp-ppc/u-boot
Configuring for P1_P2_RDB board...
   text    data     bss     dec     hex filename
 341908   32620  265212  639740   9c2fc /work/wd/tmp-ppc/u-boot

For all build targets the same board name would be printed, which
makes is often pretty difficult to find out which exact build target
caused problems. With this commit, the real make target name gets
printed instead, which is way more useful:

$ ./MAKEALL P2020RDB P2020RDB_NAND P2020RDB_SDCARD P2020RDB_SPIFLASH
Configuring for P2020RDB board...
   text    data     bss     dec     hex filename
 342612   32656  265212  640480   9c5e0 /work/wd/tmp-ppc/u-boot
Configuring for P2020RDB_NAND board...
   text    data     bss     dec     hex filename
 343160   32704  265212  641076   9c834 /work/wd/tmp-ppc/u-boot
Configuring for P2020RDB_SDCARD board...
   text    data     bss     dec     hex filename
 341908   32620  265212  639740   9c2fc /work/wd/tmp-ppc/u-boot
Configuring for P2020RDB_SPIFLASH board...
   text    data     bss     dec     hex filename
 341908   32620  265212  639740   9c2fc /work/wd/tmp-ppc/u-boot

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
Tested-by: Thomas Chou <thomas@wytron.com.tw>

Showing 1 changed file with 230 additions and 464 deletions Side-by-side Diff

Changes suppressed. Click to show
... ... @@ -467,7 +467,7 @@
467 467 unexpand -a | sed -e 's/\s\s*$$//' > $@
468 468  
469 469 include/license.h: tools/bin2header COPYING
470   - cat COPYING | gzip -9 -c | ./tools/bin2header license_gzip > include/license.h
  470 + cat COPYING | gzip -9 -c | ./tools/bin2header license_gzip > include/license.h
471 471 #########################################################################
472 472  
473 473 unconfig:
474 474  
475 475  
... ... @@ -518,20 +518,16 @@
518 518 @mkdir -p $(obj)board/digsy_mtc
519 519 @ >$(obj)include/config.h
520 520 @[ -z "$(findstring LOWBOOT_,$@)" ] || \
521   - { echo "TEXT_BASE = 0xFF000000" >$(obj)board/digsy_mtc/config.tmp ; \
522   - echo "... with LOWBOOT configuration" ; \
523   - }
  521 + echo "TEXT_BASE = 0xFF000000" >$(obj)board/digsy_mtc/config.tmp
524 522 @[ -z "$(findstring RAMBOOT_,$@)" ] || \
525   - { echo "TEXT_BASE = 0x00100000" >$(obj)board/digsy_mtc/config.tmp ; \
526   - echo "... with RAMBOOT configuration" ; \
527   - }
528   - @$(MKCONFIG) -a digsy_mtc powerpc mpc5xxx digsy_mtc
  523 + echo "TEXT_BASE = 0x00100000" >$(obj)board/digsy_mtc/config.tmp
  524 + @$(MKCONFIG) -n $@ -a digsy_mtc powerpc mpc5xxx digsy_mtc
529 525  
530 526 galaxy5200_LOWBOOT_config \
531 527 galaxy5200_config: unconfig
532 528 @mkdir -p $(obj)include
533 529 @echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
534   - @$(MKCONFIG) -a galaxy5200 powerpc mpc5xxx galaxy5200
  530 + @$(MKCONFIG) -n $@ -a galaxy5200 powerpc mpc5xxx galaxy5200
535 531  
536 532 hmi1001_config: unconfig
537 533 @$(MKCONFIG) hmi1001 powerpc mpc5xxx hmi1001
538 534  
539 535  
540 536  
... ... @@ -548,22 +544,15 @@
548 544 @mkdir -p $(obj)include
549 545 @mkdir -p $(obj)board/icecube
550 546 @[ -z "$(findstring LOWBOOT_,$@)" ] || \
551   - { if [ "$(findstring DDR,$@)" ] ; \
  547 + if [ "$(findstring DDR,$@)" ] ; \
552 548 then echo "TEXT_BASE = 0xFF800000" >$(obj)board/icecube/config.tmp ; \
553 549 else echo "TEXT_BASE = 0xFF000000" >$(obj)board/icecube/config.tmp ; \
554   - fi ; \
555   - $(XECHO) "... with LOWBOOT configuration" ; \
556   - }
  550 + fi
557 551 @[ -z "$(findstring LOWBOOT08,$@)" ] || \
558   - { echo "TEXT_BASE = 0xFF800000" >$(obj)board/icecube/config.tmp ; \
559   - echo "... with 8 MB flash only" ; \
560   - $(XECHO) "... with LOWBOOT configuration" ; \
561   - }
  552 + echo "TEXT_BASE = 0xFF800000" >$(obj)board/icecube/config.tmp
562 553 @[ -z "$(findstring DDR,$@)" ] || \
563   - { echo "#define CONFIG_MPC5200_DDR" >>$(obj)include/config.h ; \
564   - $(XECHO) "... DDR memory revision" ; \
565   - }
566   - @$(MKCONFIG) -a IceCube powerpc mpc5xxx icecube
  554 + echo "#define CONFIG_MPC5200_DDR" >>$(obj)include/config.h
  555 + @$(MKCONFIG) -n $@ -a IceCube powerpc mpc5xxx icecube
567 556  
568 557 jupiter_config: unconfig
569 558 @$(MKCONFIG) jupiter powerpc mpc5xxx jupiter
570 559  
571 560  
... ... @@ -580,17 +569,12 @@
580 569 @mkdir -p $(obj)include
581 570 @mkdir -p $(obj)board/icecube
582 571 @ echo "#define CONFIG_MPC5200_DDR" >>$(obj)include/config.h
583   - @ $(XECHO) "... DDR memory revision"
584 572 @ echo "#define CONFIG_LITE5200B" >>$(obj)include/config.h
585 573 @[ -z "$(findstring _PM_,$@)" ] || \
586   - { echo "#define CONFIG_LITE5200B_PM" >>$(obj)include/config.h ; \
587   - $(XECHO) "... with power management (low-power mode) support" ; \
588   - }
  574 + echo "#define CONFIG_LITE5200B_PM" >>$(obj)include/config.h
589 575 @[ -z "$(findstring LOWBOOT_,$@)" ] || \
590   - { echo "TEXT_BASE = 0xFF000000" >$(obj)board/icecube/config.tmp ; \
591   - $(XECHO) "... with LOWBOOT configuration" ; \
592   - }
593   - @$(MKCONFIG) -a IceCube powerpc mpc5xxx icecube
  576 + echo "TEXT_BASE = 0xFF000000" >$(obj)board/icecube/config.tmp
  577 + @$(MKCONFIG) -n $@ -a IceCube powerpc mpc5xxx icecube
594 578  
595 579 mcc200_config \
596 580 mcc200_SDRAM_config \
597 581  
598 582  
599 583  
600 584  
601 585  
602 586  
603 587  
604 588  
... ... @@ -606,38 +590,22 @@
606 590 prs200_highboot_DDR_config: unconfig
607 591 @mkdir -p $(obj)include
608 592 @mkdir -p $(obj)board/mcc200
609   - @[ -n "$(findstring highboot,$@)" ] || \
610   - { $(XECHO) "... with lowboot configuration" ; \
611   - }
612 593 @[ -z "$(findstring highboot,$@)" ] || \
613   - { echo "TEXT_BASE = 0xFFF00000" >$(obj)board/mcc200/config.tmp ; \
614   - $(XECHO) "... with highboot configuration" ; \
615   - }
  594 + echo "TEXT_BASE = 0xFFF00000" >$(obj)board/mcc200/config.tmp
616 595 @[ -n "$(findstring _SDRAM,$@)" ] || \
617   - { if [ -n "$(findstring mcc200,$@)" ]; \
618   - then \
619   - $(XECHO) "... with DDR" ; \
620   - else \
621   - if [ -n "$(findstring _DDR,$@)" ];\
  596 + if [ -n "$(findstring prs200,$@)" ]; \
  597 + then \
  598 + if [ -z "$(findstring _DDR,$@)" ];\
622 599 then \
623   - $(XECHO) "... with DDR" ; \
624   - else \
625 600 echo "#define CONFIG_MCC200_SDRAM" >>$(obj)include/config.h ;\
626   - $(XECHO) "... with SDRAM" ; \
627 601 fi; \
628   - fi; \
629   - }
  602 + fi
630 603 @[ -z "$(findstring _SDRAM,$@)" ] || \
631   - { echo "#define CONFIG_MCC200_SDRAM" >>$(obj)include/config.h ; \
632   - $(XECHO) "... with SDRAM" ; \
633   - }
  604 + echo "#define CONFIG_MCC200_SDRAM" >>$(obj)include/config.h
634 605 @[ -z "$(findstring COM12,$@)" ] || \
635   - { echo "#define CONFIG_CONSOLE_COM12" >>$(obj)include/config.h ; \
636   - $(XECHO) "... with console on COM12" ; \
637   - }
  606 + echo "#define CONFIG_CONSOLE_COM12" >>$(obj)include/config.h
638 607 @[ -z "$(findstring prs200,$@)" ] || \
639   - { echo "#define CONFIG_PRS200" >>$(obj)include/config.h ;\
640   - }
  608 + echo "#define CONFIG_PRS200" >>$(obj)include/config.h
641 609 @$(MKCONFIG) -n $@ -a mcc200 powerpc mpc5xxx mcc200
642 610  
643 611 mecp5200_config: unconfig
... ... @@ -657,7 +625,7 @@
657 625 @mkdir -p $(obj)board/mvbc_p
658 626 @ >$(obj)include/config.h
659 627 @[ -z "$(findstring MVBC_P,$@)" ] || \
660   - { echo "#define CONFIG_MVBC_P" >>$(obj)include/config.h; }
  628 + echo "#define CONFIG_MVBC_P" >>$(obj)include/config.h
661 629 @$(MKCONFIG) -n $@ -a MVBC_P powerpc mpc5xxx mvbc_p matrix_vision
662 630  
663 631 MVSMR_config: unconfig
... ... @@ -673,10 +641,8 @@
673 641 @mkdir -p $(obj)include $(obj)board/phytec/pcm030
674 642 @ >$(obj)include/config.h
675 643 @[ -z "$(findstring LOWBOOT_,$@)" ] || \
676   - { echo "TEXT_BASE = 0xFF000000" >$(obj)board/phytec/pcm030/config.tmp ; \
677   - echo "... with LOWBOOT configuration" ; \
678   - }
679   - @$(MKCONFIG) -a pcm030 powerpc mpc5xxx pcm030 phytec
  644 + echo "TEXT_BASE = 0xFF000000" >$(obj)board/phytec/pcm030/config.tmp
  645 + @$(MKCONFIG) -n $@ -a pcm030 powerpc mpc5xxx pcm030 phytec
680 646  
681 647 pf5200_config: unconfig
682 648 @$(MKCONFIG) pf5200 powerpc mpc5xxx pf5200 esd
683 649  
... ... @@ -687,14 +653,10 @@
687 653 PM520_ROMBOOT_DDR_config: unconfig
688 654 @mkdir -p $(obj)include
689 655 @[ -z "$(findstring DDR,$@)" ] || \
690   - { echo "#define CONFIG_MPC5200_DDR" >>$(obj)include/config.h ; \
691   - $(XECHO) "... DDR memory revision" ; \
692   - }
  656 + echo "#define CONFIG_MPC5200_DDR" >>$(obj)include/config.h
693 657 @[ -z "$(findstring ROMBOOT,$@)" ] || \
694   - { echo "#define CONFIG_BOOT_ROM" >>$(obj)include/config.h ; \
695   - $(XECHO) "... booting from 8-bit flash" ; \
696   - }
697   - @$(MKCONFIG) -a PM520 powerpc mpc5xxx pm520
  658 + echo "#define CONFIG_BOOT_ROM" >>$(obj)include/config.h
  659 + @$(MKCONFIG) -n $@ -a PM520 powerpc mpc5xxx pm520
698 660  
699 661 smmaco4_config: unconfig
700 662 @$(MKCONFIG) -a smmaco4 powerpc mpc5xxx tqm5200 tqc
... ... @@ -706,9 +668,7 @@
706 668 TB5200_config: unconfig
707 669 @mkdir -p $(obj)include
708 670 @[ -z "$(findstring _B,$@)" ] || \
709   - { echo "#define CONFIG_TQM5200_B" >>$(obj)include/config.h ; \
710   - $(XECHO) "... with MPC5200B processor" ; \
711   - }
  671 + echo "#define CONFIG_TQM5200_B" >>$(obj)include/config.h
712 672 @$(MKCONFIG) -n $@ -a TB5200 powerpc mpc5xxx tqm5200 tqc
713 673  
714 674 MINI5200_config \
715 675  
716 676  
... ... @@ -725,18 +685,12 @@
725 685 @mkdir -p $(obj)include
726 686 @mkdir -p $(obj)board/total5200
727 687 @[ -n "$(findstring Rev,$@)" ] || \
728   - { echo "#define CONFIG_TOTAL5200_REV 1" >>$(obj)include/config.h ; \
729   - $(XECHO) "... revision 1 board" ; \
730   - }
  688 + echo "#define CONFIG_TOTAL5200_REV 1" >>$(obj)include/config.h
731 689 @[ -z "$(findstring Rev2_,$@)" ] || \
732   - { echo "#define CONFIG_TOTAL5200_REV 2" >>$(obj)include/config.h ; \
733   - $(XECHO) "... revision 2 board" ; \
734   - }
  690 + echo "#define CONFIG_TOTAL5200_REV 2" >>$(obj)include/config.h
735 691 @[ -z "$(findstring lowboot_,$@)" ] || \
736   - { echo "TEXT_BASE = 0xFE000000" >$(obj)board/total5200/config.tmp ; \
737   - $(XECHO) "... with lowboot configuration" ; \
738   - }
739   - @$(MKCONFIG) -a Total5200 powerpc mpc5xxx total5200
  692 + echo "TEXT_BASE = 0xFE000000" >$(obj)board/total5200/config.tmp
  693 + @$(MKCONFIG) -n $@ -a Total5200 powerpc mpc5xxx total5200
740 694  
741 695 cam5200_config \
742 696 cam5200_niosflash_config \
743 697  
744 698  
745 699  
746 700  
747 701  
748 702  
749 703  
... ... @@ -751,37 +705,26 @@
751 705 @mkdir -p $(obj)include
752 706 @mkdir -p $(obj)board/tqc/tqm5200
753 707 @[ -z "$(findstring cam5200,$@)" ] || \
754   - { echo "#define CONFIG_CAM5200" >>$(obj)include/config.h ; \
755   - echo "#define CONFIG_TQM5200S" >>$(obj)include/config.h ; \
756   - echo "#define CONFIG_TQM5200_B" >>$(obj)include/config.h ; \
757   - $(XECHO) "... TQM5200S on Cam5200" ; \
  708 + { echo "#define CONFIG_CAM5200" >>$(obj)include/config.h ; \
  709 + echo "#define CONFIG_TQM5200S" >>$(obj)include/config.h ; \
  710 + echo "#define CONFIG_TQM5200_B" >>$(obj)include/config.h ; \
758 711 }
759 712 @[ -z "$(findstring niosflash,$@)" ] || \
760   - { echo "#define CONFIG_CAM5200_NIOSFLASH" >>$(obj)include/config.h ; \
761   - $(XECHO) "... with NIOS flash driver" ; \
762   - }
  713 + echo "#define CONFIG_CAM5200_NIOSFLASH" >>$(obj)include/config.h
763 714 @[ -z "$(findstring fo300,$@)" ] || \
764   - { echo "#define CONFIG_FO300" >>$(obj)include/config.h ; \
765   - $(XECHO) "... TQM5200 on FO300" ; \
766   - }
  715 + echo "#define CONFIG_FO300" >>$(obj)include/config.h
767 716 @[ -z "$(findstring MiniFAP,$@)" ] || \
768   - { echo "#define CONFIG_MINIFAP" >>$(obj)include/config.h ; \
769   - $(XECHO) "... TQM5200_AC on MiniFAP" ; \
770   - }
  717 + echo "#define CONFIG_MINIFAP" >>$(obj)include/config.h
771 718 @[ -z "$(findstring STK100,$@)" ] || \
772   - { echo "#define CONFIG_STK52XX_REV100" >>$(obj)include/config.h ; \
773   - $(XECHO) "... on a STK52XX.100 base board" ; \
774   - }
  719 + echo "#define CONFIG_STK52XX_REV100" >>$(obj)include/config.h
775 720 @[ -z "$(findstring TQM5200_B,$@)" ] || \
776   - { echo "#define CONFIG_TQM5200_B" >>$(obj)include/config.h ; \
777   - }
  721 + echo "#define CONFIG_TQM5200_B" >>$(obj)include/config.h
778 722 @[ -z "$(findstring TQM5200S,$@)" ] || \
779   - { echo "#define CONFIG_TQM5200S" >>$(obj)include/config.h ; \
780   - echo "#define CONFIG_TQM5200_B" >>$(obj)include/config.h ; \
  723 + { echo "#define CONFIG_TQM5200S" >>$(obj)include/config.h ; \
  724 + echo "#define CONFIG_TQM5200_B" >>$(obj)include/config.h ; \
781 725 }
782 726 @[ -z "$(findstring HIGHBOOT,$@)" ] || \
783   - { echo "TEXT_BASE = 0xFFF00000" >$(obj)board/tqm5200/config.tmp ; \
784   - }
  727 + echo "TEXT_BASE = 0xFFF00000" >$(obj)board/tqm5200/config.tmp
785 728 @$(MKCONFIG) -n $@ -a TQM5200 powerpc mpc5xxx tqm5200 tqc
786 729  
787 730 uc101_config: unconfig
... ... @@ -807,7 +750,7 @@
807 750 @if [ "$(findstring rev2,$@)" ] ; then \
808 751 echo "#define CONFIG_ADS5121_REV2 1" > $(obj)include/config.h; \
809 752 fi
810   - @$(MKCONFIG) -a mpc5121ads powerpc mpc512x mpc5121ads freescale
  753 + @$(MKCONFIG) -n $@ -a mpc5121ads powerpc mpc512x mpc5121ads freescale
811 754  
812 755 pdm360ng_config: unconfig
813 756 @$(MKCONFIG) -a pdm360ng powerpc mpc512x pdm360ng
814 757  
815 758  
816 759  
817 760  
... ... @@ -816,25 +759,23 @@
816 759 ## MPC8xx Systems
817 760 #########################################################################
818 761  
819   -Adder_config \
820 762 Adder87x_config \
821 763 AdderII_config \
  764 +AdderUSB_config \
  765 +Adder_config \
822 766 : unconfig
823 767 @mkdir -p $(obj)include
824 768 $(if $(findstring AdderII,$@), \
825   - @echo "#define CONFIG_MPC852T" > $(obj)include/config.h)
826   - @$(MKCONFIG) -a Adder powerpc mpc8xx adder
  769 + @echo "#define CONFIG_MPC852T" > $(obj)include/config.h)
  770 + @$(MKCONFIG) -n $@ -a Adder powerpc mpc8xx adder
827 771  
828   -AdderUSB_config: unconfig
829   - @$(MKCONFIG) -a AdderUSB powerpc mpc8xx adder
830   -
831 772 ADS860_config \
832 773 FADS823_config \
833 774 FADS850SAR_config \
834 775 MPC86xADS_config \
835 776 MPC885ADS_config \
836 777 FADS860T_config: unconfig
837   - @$(MKCONFIG) $(@:_config=) powerpc mpc8xx fads
  778 + @$(MKCONFIG) -n $@ $(@:_config=) powerpc mpc8xx fads
838 779  
839 780 AMX860_config : unconfig
840 781 @$(MKCONFIG) $(@:_config=) powerpc mpc8xx amx860 westel
... ... @@ -869,10 +810,8 @@
869 810 GEN860T_config: unconfig
870 811 @mkdir -p $(obj)include
871 812 @[ -z "$(findstring _SC,$@)" ] || \
872   - { echo "#define CONFIG_SC" >>$(obj)include/config.h ; \
873   - $(XECHO) "With reduced H/W feature set (SC)..." ; \
874   - }
875   - @$(MKCONFIG) -a $(call xtract_GEN860T,$@) powerpc mpc8xx gen860t
  813 + echo "#define CONFIG_SC" >>$(obj)include/config.h
  814 + @$(MKCONFIG) -n $@ -a $(call xtract_GEN860T,$@) powerpc mpc8xx gen860t
876 815  
877 816 GENIETV_config: unconfig
878 817 @$(MKCONFIG) $(@:_config=) powerpc mpc8xx genietv
... ... @@ -895,10 +834,8 @@
895 834 ICU862_config: unconfig
896 835 @mkdir -p $(obj)include
897 836 @[ -z "$(findstring _100MHz,$@)" ] || \
898   - { echo "#define CONFIG_100MHz" >>$(obj)include/config.h ; \
899   - $(XECHO) "... with 100MHz system clock" ; \
900   - }
901   - @$(MKCONFIG) -a $(call xtract_ICU862,$@) powerpc mpc8xx icu862
  837 + echo "#define CONFIG_100MHz" >>$(obj)include/config.h
  838 + @$(MKCONFIG) -n $@ -a $(call xtract_ICU862,$@) powerpc mpc8xx icu862
902 839  
903 840 IP860_config : unconfig
904 841 @$(MKCONFIG) $(@:_config=) powerpc mpc8xx ip860
905 842  
906 843  
907 844  
908 845  
909 846  
... ... @@ -908,30 +845,24 @@
908 845 IVML24_config: unconfig
909 846 @mkdir -p $(obj)include
910 847 @[ -z "$(findstring IVML24_config,$@)" ] || \
911   - { echo "#define CONFIG_IVML24_16M" >>$(obj)include/config.h ; \
912   - }
  848 + echo "#define CONFIG_IVML24_16M" >>$(obj)include/config.h
913 849 @[ -z "$(findstring IVML24_128_config,$@)" ] || \
914   - { echo "#define CONFIG_IVML24_32M" >>$(obj)include/config.h ; \
915   - }
  850 + echo "#define CONFIG_IVML24_32M" >>$(obj)include/config.h
916 851 @[ -z "$(findstring IVML24_256_config,$@)" ] || \
917   - { echo "#define CONFIG_IVML24_64M" >>$(obj)include/config.h ; \
918   - }
919   - @$(MKCONFIG) -a IVML24 powerpc mpc8xx ivm
  852 + echo "#define CONFIG_IVML24_64M" >>$(obj)include/config.h
  853 + @$(MKCONFIG) -n $@ -a IVML24 powerpc mpc8xx ivm
920 854  
921 855 IVMS8_256_config \
922 856 IVMS8_128_config \
923 857 IVMS8_config: unconfig
924 858 @mkdir -p $(obj)include
925 859 @[ -z "$(findstring IVMS8_config,$@)" ] || \
926   - { echo "#define CONFIG_IVMS8_16M" >>$(obj)include/config.h ; \
927   - }
  860 + echo "#define CONFIG_IVMS8_16M" >>$(obj)include/config.h
928 861 @[ -z "$(findstring IVMS8_128_config,$@)" ] || \
929   - { echo "#define CONFIG_IVMS8_32M" >>$(obj)include/config.h ; \
930   - }
  862 + echo "#define CONFIG_IVMS8_32M" >>$(obj)include/config.h
931 863 @[ -z "$(findstring IVMS8_256_config,$@)" ] || \
932   - { echo "#define CONFIG_IVMS8_64M" >>$(obj)include/config.h ; \
933   - }
934   - @$(MKCONFIG) -a IVMS8 powerpc mpc8xx ivm
  864 + echo "#define CONFIG_IVMS8_64M" >>$(obj)include/config.h
  865 + @$(MKCONFIG) -n $@ -a IVMS8 powerpc mpc8xx ivm
935 866  
936 867 kmsupx4_config: unconfig
937 868 @$(MKCONFIG) $(@:_config=) powerpc mpc8xx km8xx keymile
... ... @@ -950,7 +881,7 @@
950 881  
951 882 MBX_config \
952 883 MBX860T_config: unconfig
953   - @$(MKCONFIG) $(@:_config=) powerpc mpc8xx mbx8xx
  884 + @$(MKCONFIG) -n $@ $(@:_config=) powerpc mpc8xx mbx8xx
954 885  
955 886 mgsuvd_config: unconfig
956 887 @$(MKCONFIG) $(@:_config=) powerpc mpc8xx km8xx keymile
957 888  
... ... @@ -964,14 +895,10 @@
964 895 NETVIA_config: unconfig
965 896 @mkdir -p $(obj)include
966 897 @[ -z "$(findstring NETVIA_config,$@)" ] || \
967   - { echo "#define CONFIG_NETVIA_VERSION 1" >>$(obj)include/config.h ; \
968   - $(XECHO) "... Version 1" ; \
969   - }
  898 + echo "#define CONFIG_NETVIA_VERSION 1" >>$(obj)include/config.h
970 899 @[ -z "$(findstring NETVIA_V2_config,$@)" ] || \
971   - { echo "#define CONFIG_NETVIA_VERSION 2" >>$(obj)include/config.h ; \
972   - $(XECHO) "... Version 2" ; \
973   - }
974   - @$(MKCONFIG) -a $(call xtract_NETVIA,$@) powerpc mpc8xx netvia
  900 + echo "#define CONFIG_NETVIA_VERSION 2" >>$(obj)include/config.h
  901 + @$(MKCONFIG) -n $@ -a $(call xtract_NETVIA,$@) powerpc mpc8xx netvia
975 902  
976 903 xtract_NETPHONE = $(subst _V2,,$(subst _config,,$1))
977 904  
978 905  
... ... @@ -979,12 +906,10 @@
979 906 NETPHONE_config: unconfig
980 907 @mkdir -p $(obj)include
981 908 @[ -z "$(findstring NETPHONE_config,$@)" ] || \
982   - { echo "#define CONFIG_NETPHONE_VERSION 1" >>$(obj)include/config.h ; \
983   - }
  909 + echo "#define CONFIG_NETPHONE_VERSION 1" >>$(obj)include/config.h
984 910 @[ -z "$(findstring NETPHONE_V2_config,$@)" ] || \
985   - { echo "#define CONFIG_NETPHONE_VERSION 2" >>$(obj)include/config.h ; \
986   - }
987   - @$(MKCONFIG) -a $(call xtract_NETPHONE,$@) powerpc mpc8xx netphone
  911 + echo "#define CONFIG_NETPHONE_VERSION 2" >>$(obj)include/config.h
  912 + @$(MKCONFIG) -n $@ -a $(call xtract_NETPHONE,$@) powerpc mpc8xx netphone
988 913  
989 914 xtract_NETTA = $(subst _SWAPHOOK,,$(subst _6412,,$(subst _ISDN,,$(subst _config,,$1))))
990 915  
991 916  
992 917  
993 918  
994 919  
995 920  
... ... @@ -998,24 +923,18 @@
998 923 NETTA_config: unconfig
999 924 @mkdir -p $(obj)include
1000 925 @[ -z "$(findstring ISDN_,$@)" ] || \
1001   - { echo "#define CONFIG_NETTA_ISDN 1" >>$(obj)include/config.h ; \
1002   - }
  926 + echo "#define CONFIG_NETTA_ISDN 1" >>$(obj)include/config.h
1003 927 @[ -n "$(findstring ISDN_,$@)" ] || \
1004   - { echo "#undef CONFIG_NETTA_ISDN" >>$(obj)include/config.h ; \
1005   - }
  928 + echo "#undef CONFIG_NETTA_ISDN" >>$(obj)include/config.h
1006 929 @[ -z "$(findstring 6412_,$@)" ] || \
1007   - { echo "#define CONFIG_NETTA_6412 1" >>$(obj)include/config.h ; \
1008   - }
  930 + echo "#define CONFIG_NETTA_6412 1" >>$(obj)include/config.h
1009 931 @[ -n "$(findstring 6412_,$@)" ] || \
1010   - { echo "#undef CONFIG_NETTA_6412" >>$(obj)include/config.h ; \
1011   - }
  932 + echo "#undef CONFIG_NETTA_6412" >>$(obj)include/config.h
1012 933 @[ -z "$(findstring SWAPHOOK_,$@)" ] || \
1013   - { echo "#define CONFIG_NETTA_SWAPHOOK 1" >>$(obj)include/config.h ; \
1014   - }
  934 + echo "#define CONFIG_NETTA_SWAPHOOK 1" >>$(obj)include/config.h
1015 935 @[ -n "$(findstring SWAPHOOK_,$@)" ] || \
1016   - { echo "#undef CONFIG_NETTA_SWAPHOOK" >>$(obj)include/config.h ; \
1017   - }
1018   - @$(MKCONFIG) -a $(call xtract_NETTA,$@) powerpc mpc8xx netta
  936 + echo "#undef CONFIG_NETTA_SWAPHOOK" >>$(obj)include/config.h
  937 + @$(MKCONFIG) -n $@ -a $(call xtract_NETTA,$@) powerpc mpc8xx netta
1019 938  
1020 939 xtract_NETTA2 = $(subst _V2,,$(subst _config,,$1))
1021 940  
1022 941  
1023 942  
1024 943  
1025 944  
... ... @@ -1023,28 +942,26 @@
1023 942 NETTA2_config: unconfig
1024 943 @mkdir -p $(obj)include
1025 944 @[ -z "$(findstring NETTA2_config,$@)" ] || \
1026   - { echo "#define CONFIG_NETTA2_VERSION 1" >>$(obj)include/config.h ; \
1027   - }
  945 + echo "#define CONFIG_NETTA2_VERSION 1" >>$(obj)include/config.h
1028 946 @[ -z "$(findstring NETTA2_V2_config,$@)" ] || \
1029   - { echo "#define CONFIG_NETTA2_VERSION 2" >>$(obj)include/config.h ; \
1030   - }
1031   - @$(MKCONFIG) -a $(call xtract_NETTA2,$@) powerpc mpc8xx netta2
  947 + echo "#define CONFIG_NETTA2_VERSION 2" >>$(obj)include/config.h
  948 + @$(MKCONFIG) -n $@ -a $(call xtract_NETTA2,$@) powerpc mpc8xx netta2
1032 949  
1033 950 NC650_Rev1_config \
1034 951 NC650_Rev2_config \
1035 952 CP850_config: unconfig
1036 953 @mkdir -p $(obj)include
1037 954 @[ -z "$(findstring CP850,$@)" ] || \
1038   - { echo "#define CONFIG_CP850 1" >>$(obj)include/config.h ; \
1039   - echo "#define CONFIG_IDS852_REV2 1" >>$(obj)include/config.h ; \
1040   - }
  955 + { echo "#define CONFIG_CP850 1" >>$(obj)include/config.h ; \
  956 + echo "#define CONFIG_IDS852_REV2 1" >>$(obj)include/config.h ; \
  957 + }
1041 958 @[ -z "$(findstring Rev1,$@)" ] || \
1042   - { echo "#define CONFIG_IDS852_REV1 1" >>$(obj)include/config.h ; \
1043   - }
  959 + { echo "#define CONFIG_IDS852_REV1 1" >>$(obj)include/config.h ; \
  960 + }
1044 961 @[ -z "$(findstring Rev2,$@)" ] || \
1045   - { echo "#define CONFIG_IDS852_REV2 1" >>$(obj)include/config.h ; \
1046   - }
1047   - @$(MKCONFIG) -a NC650 powerpc mpc8xx nc650
  962 + { echo "#define CONFIG_IDS852_REV2 1" >>$(obj)include/config.h ; \
  963 + }
  964 + @$(MKCONFIG) -n $@ -a NC650 powerpc mpc8xx nc650
1048 965  
1049 966 NX823_config: unconfig
1050 967 @$(MKCONFIG) $(@:_config=) powerpc mpc8xx nx823
1051 968  
1052 969  
... ... @@ -1086,19 +1003,14 @@
1086 1003 RPXlite_DW_config: unconfig
1087 1004 @mkdir -p $(obj)include
1088 1005 @[ -z "$(findstring _64,$@)" ] || \
1089   - { echo "#define RPXlite_64MHz" >>$(obj)include/config.h ; \
1090   - $(XECHO) "... with 64MHz system clock ..."; \
1091   - }
  1006 + echo "#define RPXlite_64MHz" >>$(obj)include/config.h
1092 1007 @[ -z "$(findstring _LCD,$@)" ] || \
1093 1008 { echo "#define CONFIG_LCD" >>$(obj)include/config.h ; \
1094 1009 echo "#define CONFIG_NEC_NL6448BC20" >>$(obj)include/config.h ; \
1095   - $(XECHO) "... with LCD display ..."; \
1096 1010 }
1097 1011 @[ -z "$(findstring _NVRAM,$@)" ] || \
1098   - { echo "#define CONFIG_ENV_IS_IN_NVRAM" >>$(obj)include/config.h ; \
1099   - $(XECHO) "... with ENV in NVRAM ..."; \
1100   - }
1101   - @$(MKCONFIG) -a RPXlite_DW powerpc mpc8xx RPXlite_dw
  1012 + echo "#define CONFIG_ENV_IS_IN_NVRAM" >>$(obj)include/config.h
  1013 + @$(MKCONFIG) -n $@ -a RPXlite_DW powerpc mpc8xx RPXlite_dw
1102 1014  
1103 1015 rmu_config: unconfig
1104 1016 @$(MKCONFIG) $(@:_config=) powerpc mpc8xx rmu
1105 1017  
... ... @@ -1161,9 +1073,8 @@
1161 1073 @[ -z "$(findstring _LCD,$@)" ] || \
1162 1074 { echo "#define CONFIG_LCD" >>$(obj)include/config.h ; \
1163 1075 echo "#define CONFIG_NEC_NL6448BC20" >>$(obj)include/config.h ; \
1164   - $(XECHO) "... with LCD display" ; \
1165 1076 }
1166   - @$(MKCONFIG) -a $(call xtract_8xx,$@) powerpc mpc8xx tqm8xx tqc
  1077 + @$(MKCONFIG) -n $@ -a $(call xtract_8xx,$@) powerpc mpc8xx tqm8xx tqc
1167 1078  
1168 1079 TTTech_config: unconfig
1169 1080 @mkdir -p $(obj)include
1170 1081  
1171 1082  
1172 1083  
1173 1084  
... ... @@ -1253,25 +1164,21 @@
1253 1164 @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
1254 1165 @echo "#define CONFIG_$$(echo $(subst ,,$(@:_nand_config=)) | \
1255 1166 tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h
1256   - @$(MKCONFIG) -n $@ -a canyonlands powerpc ppc4xx canyonlands amcc
1257 1167 @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/canyonlands/config.tmp
1258 1168 @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
  1169 + @$(MKCONFIG) -n $@ -a canyonlands powerpc ppc4xx canyonlands amcc
1259 1170  
1260 1171 CATcenter_config \
1261 1172 CATcenter_25_config \
1262 1173 CATcenter_33_config: unconfig
1263 1174 @mkdir -p $(obj)include
1264   - @ echo "/* CATcenter uses PPChameleon Model ME */" > $(obj)include/config.h
1265   - @ echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 1" >> $(obj)include/config.h
  1175 + @echo "/* CATcenter uses PPChameleon Model ME */" > $(obj)include/config.h
  1176 + @echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 1" >> $(obj)include/config.h
1266 1177 @[ -z "$(findstring _25,$@)" ] || \
1267   - { echo "#define CONFIG_PPCHAMELEON_CLK_25" >> $(obj)include/config.h ; \
1268   - $(XECHO) "SysClk = 25MHz" ; \
1269   - }
  1178 + echo "#define CONFIG_PPCHAMELEON_CLK_25" >> $(obj)include/config.h
1270 1179 @[ -z "$(findstring _33,$@)" ] || \
1271   - { echo "#define CONFIG_PPCHAMELEON_CLK_33" >> $(obj)include/config.h ; \
1272   - $(XECHO) "SysClk = 33MHz" ; \
1273   - }
1274   - @$(MKCONFIG) -a $(call xtract_4xx,$@) powerpc ppc4xx PPChameleonEVB dave
  1180 + echo "#define CONFIG_PPCHAMELEON_CLK_33" >> $(obj)include/config.h
  1181 + @$(MKCONFIG) -n $@ -a $(call xtract_4xx,$@) powerpc ppc4xx PPChameleonEVB dave
1275 1182  
1276 1183 CMS700_config: unconfig
1277 1184 @$(MKCONFIG) $(@:_config=) powerpc ppc4xx cms700 esd
... ... @@ -1284,7 +1191,7 @@
1284 1191 CPCI405DT_config \
1285 1192 CPCI405AB_config: unconfig
1286 1193 @mkdir -p $(obj)board/esd/cpci405
1287   - @$(MKCONFIG) $(@:_config=) powerpc ppc4xx cpci405 esd
  1194 + @$(MKCONFIG) -n $@ $(@:_config=) powerpc ppc4xx cpci405 esd
1288 1195  
1289 1196 CPCIISER4_config: unconfig
1290 1197 @$(MKCONFIG) $(@:_config=) powerpc ppc4xx cpciiser4 esd
1291 1198  
... ... @@ -1387,9 +1294,9 @@
1387 1294 @mkdir -p $(obj)include $(obj)board/amcc/kilauea
1388 1295 @mkdir -p $(obj)nand_spl/board/amcc/kilauea
1389 1296 @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
1390   - @$(MKCONFIG) -n $@ -a kilauea powerpc ppc4xx kilauea amcc
1391 1297 @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/kilauea/config.tmp
1392 1298 @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
  1299 + @$(MKCONFIG) -n $@ -a kilauea powerpc ppc4xx kilauea amcc
1393 1300  
1394 1301 korat_config: unconfig
1395 1302 @$(MKCONFIG) $(@:_config=) powerpc ppc4xx korat
... ... @@ -1448,7 +1355,7 @@
1448 1355  
1449 1356 OCRTC_config \
1450 1357 ORSG_config: unconfig
1451   - @$(MKCONFIG) $(@:_config=) powerpc ppc4xx ocrtc esd
  1358 + @$(MKCONFIG) -n $@ $(@:_config=) powerpc ppc4xx ocrtc esd
1452 1359  
1453 1360 p3p440_config: unconfig
1454 1361 @$(MKCONFIG) $(@:_config=) powerpc ppc4xx p3p440 prodrive
1455 1362  
1456 1363  
1457 1364  
1458 1365  
... ... @@ -1483,26 +1390,16 @@
1483 1390 PPChameleonEVB_HI_33_config: unconfig
1484 1391 @mkdir -p $(obj)include
1485 1392 @[ -z "$(findstring EVB_BA,$@)" ] || \
1486   - { echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 0" >>$(obj)include/config.h ; \
1487   - $(XECHO) "... BASIC model" ; \
1488   - }
  1393 + echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 0" >>$(obj)include/config.h
1489 1394 @[ -z "$(findstring EVB_ME,$@)" ] || \
1490   - { echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 1" >>$(obj)include/config.h ; \
1491   - $(XECHO) "... MEDIUM model" ; \
1492   - }
  1395 + echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 1" >>$(obj)include/config.h
1493 1396 @[ -z "$(findstring EVB_HI,$@)" ] || \
1494   - { echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 2" >>$(obj)include/config.h ; \
1495   - $(XECHO) "... HIGH-END model" ; \
1496   - }
  1397 + echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 2" >>$(obj)include/config.h
1497 1398 @[ -z "$(findstring _25,$@)" ] || \
1498   - { echo "#define CONFIG_PPCHAMELEON_CLK_25" >>$(obj)include/config.h ; \
1499   - $(XECHO) "SysClk = 25MHz" ; \
1500   - }
  1399 + echo "#define CONFIG_PPCHAMELEON_CLK_25" >>$(obj)include/config.h
1501 1400 @[ -z "$(findstring _33,$@)" ] || \
1502   - { echo "#define CONFIG_PPCHAMELEON_CLK_33" >>$(obj)include/config.h ; \
1503   - $(XECHO) "SysClk = 33MHz" ; \
1504   - }
1505   - @$(MKCONFIG) -a $(call xtract_4xx,$@) powerpc ppc4xx PPChameleonEVB dave
  1401 + echo "#define CONFIG_PPCHAMELEON_CLK_33" >>$(obj)include/config.h
  1402 + @$(MKCONFIG) -n $@ -a $(call xtract_4xx,$@) powerpc ppc4xx PPChameleonEVB dave
1506 1403  
1507 1404 quad100hd_config: unconfig
1508 1405 @$(MKCONFIG) $(@:_config=) powerpc ppc4xx quad100hd
1509 1406  
... ... @@ -1530,9 +1427,9 @@
1530 1427 @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
1531 1428 @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
1532 1429 tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h
1533   - @$(MKCONFIG) -n $@ -a sequoia powerpc ppc4xx sequoia amcc
1534 1430 @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/sequoia/config.tmp
1535 1431 @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
  1432 + @$(MKCONFIG) -n $@ -a sequoia powerpc ppc4xx sequoia amcc
1536 1433  
1537 1434 sequoia_ramboot_config \
1538 1435 rainier_ramboot_config: unconfig
1539 1436  
... ... @@ -1540,10 +1437,10 @@
1540 1437 @echo "#define CONFIG_SYS_RAMBOOT" > $(obj)include/config.h
1541 1438 @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
1542 1439 tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h
1543   - @$(MKCONFIG) -n $@ -a sequoia powerpc ppc4xx sequoia amcc
1544 1440 @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/sequoia/config.tmp
1545 1441 @echo "LDSCRIPT = board/amcc/sequoia/u-boot-ram.lds" >> \
1546 1442 $(obj)board/amcc/sequoia/config.tmp
  1443 + @$(MKCONFIG) -n $@ -a sequoia powerpc ppc4xx sequoia amcc
1547 1444  
1548 1445 taihu_config: unconfig
1549 1446 @$(MKCONFIG) $(@:_config=) powerpc ppc4xx taihu amcc
... ... @@ -1577,7 +1474,7 @@
1577 1474  
1578 1475 W7OLMC_config \
1579 1476 W7OLMG_config: unconfig
1580   - @$(MKCONFIG) $(@:_config=) powerpc ppc4xx w7o
  1477 + @$(MKCONFIG) -n $@ $(@:_config=) powerpc ppc4xx w7o
1581 1478  
1582 1479 # Walnut & Sycamore images are identical (recognized via PVR)
1583 1480 walnut_config \
... ... @@ -1641,7 +1538,7 @@
1641 1538  
1642 1539 Alaska8220_config \
1643 1540 Yukon8220_config: unconfig
1644   - @$(MKCONFIG) $(@:_config=) powerpc mpc8220 alaska
  1541 + @$(MKCONFIG) -n $@ $(@:_config=) powerpc mpc8220 alaska
1645 1542  
1646 1543 sorcery_config: unconfig
1647 1544 @$(MKCONFIG) $(@:_config=) powerpc mpc8220 sorcery
1648 1545  
1649 1546  
1650 1547  
... ... @@ -1662,16 +1559,14 @@
1662 1559  
1663 1560 CPC45_config \
1664 1561 CPC45_ROMBOOT_config: unconfig
1665   - @$(MKCONFIG) $(call xtract_82xx,$@) powerpc mpc824x cpc45
1666   - @cd $(obj)include ; \
  1562 + @mkdir -p $(obj)include ; \
1667 1563 if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
1668   - echo "CONFIG_BOOT_ROM = y" >> config.mk ; \
1669   - $(XECHO) "... booting from 8-bit flash" ; \
  1564 + echo "CONFIG_BOOT_ROM = y" >> $(obj)include/config.mk ; \
1670 1565 else \
1671   - echo "CONFIG_BOOT_ROM = n" >> config.mk ; \
1672   - $(XECHO) "... booting from 64-bit flash" ; \
  1566 + echo "CONFIG_BOOT_ROM = n" >> $(obj)include/config.mk ; \
1673 1567 fi; \
1674   - echo "export CONFIG_BOOT_ROM" >> config.mk;
  1568 + echo "export CONFIG_BOOT_ROM" >> $(obj)include/config.mk;
  1569 + @$(MKCONFIG) -n $@ $(call xtract_82xx,$@) powerpc mpc824x cpc45
1675 1570  
1676 1571 CU824_config: unconfig
1677 1572 @$(MKCONFIG) $(@:_config=) powerpc mpc824x cu824
1678 1573  
1679 1574  
1680 1575  
1681 1576  
1682 1577  
1683 1578  
1684 1579  
1685 1580  
... ... @@ -1739,33 +1634,29 @@
1739 1634  
1740 1635 CPU86_config \
1741 1636 CPU86_ROMBOOT_config: unconfig
1742   - @$(MKCONFIG) $(call xtract_82xx,$@) powerpc mpc8260 cpu86
1743   - @cd $(obj)include ; \
  1637 + @mkdir -p $(obj)include ; \
1744 1638 if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
1745   - echo "CONFIG_BOOT_ROM = y" >> config.mk ; \
1746   - $(XECHO) "... booting from 8-bit flash" ; \
  1639 + echo "CONFIG_BOOT_ROM = y" >> $(obj)include/config.mk ; \
1747 1640 else \
1748   - echo "CONFIG_BOOT_ROM = n" >> config.mk ; \
1749   - $(XECHO) "... booting from 64-bit flash" ; \
  1641 + echo "CONFIG_BOOT_ROM = n" >> $(obj)include/config.mk ; \
1750 1642 fi; \
1751   - echo "export CONFIG_BOOT_ROM" >> config.mk;
  1643 + echo "export CONFIG_BOOT_ROM" >> $(obj)include/config.mk;
  1644 + @$(MKCONFIG) -n $@ $(call xtract_82xx,$@) powerpc mpc8260 cpu86
1752 1645  
1753 1646 CPU87_config \
1754 1647 CPU87_ROMBOOT_config: unconfig
1755   - @$(MKCONFIG) $(call xtract_82xx,$@) powerpc mpc8260 cpu87
1756   - @cd $(obj)include ; \
  1648 + @mkdir -p $(obj)include ; \
1757 1649 if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
1758   - echo "CONFIG_BOOT_ROM = y" >> config.mk ; \
1759   - $(XECHO) "... booting from 8-bit flash" ; \
  1650 + echo "CONFIG_BOOT_ROM = y" >> $(obj)include/config.mk ; \
1760 1651 else \
1761   - echo "CONFIG_BOOT_ROM = n" >> config.mk ; \
1762   - $(XECHO) "... booting from 64-bit flash" ; \
  1652 + echo "CONFIG_BOOT_ROM = n" >> $(obj)include/config.mk ; \
1763 1653 fi; \
1764   - echo "export CONFIG_BOOT_ROM" >> config.mk;
  1654 + echo "export CONFIG_BOOT_ROM" >> $(obj)include/config.mk;
  1655 + @$(MKCONFIG) -n $@ $(call xtract_82xx,$@) powerpc mpc8260 cpu87
1765 1656  
1766 1657 ep8248_config \
1767 1658 ep8248E_config : unconfig
1768   - @$(MKCONFIG) ep8248 powerpc mpc8260 ep8248
  1659 + @$(MKCONFIG) -n $@ ep8248 powerpc mpc8260 ep8248
1769 1660  
1770 1661 ep8260_config: unconfig
1771 1662 @$(MKCONFIG) $(@:_config=) powerpc mpc8260 ep8260
... ... @@ -1791,7 +1682,7 @@
1791 1682 @if [ "$(findstring _REVB_,$@)" ] ; then \
1792 1683 echo "#define CONFIG_SYS_REV_B" > $(obj)include/config.h ; \
1793 1684 fi
1794   - @$(MKCONFIG) -a ISPAN powerpc mpc8260 ispan
  1685 + @$(MKCONFIG) -n $@ -a ISPAN powerpc mpc8260 ispan
1795 1686  
1796 1687 mgcoge_config : unconfig
1797 1688 @$(MKCONFIG) mgcoge powerpc mpc8260 mgcoge keymile
... ... @@ -1823,10 +1714,8 @@
1823 1714 $(if $(findstring VR,$@), \
1824 1715 @echo "#define CONFIG_8260_CLKIN 66000000" >> $(obj)include/config.h))
1825 1716 @[ -z "$(findstring lowboot_,$@)" ] || \
1826   - { echo "TEXT_BASE = 0xFF800000" >$(obj)board/freescale/mpc8260ads/config.tmp ; \
1827   - $(XECHO) "... with lowboot configuration" ; \
1828   - }
1829   - @$(MKCONFIG) -a MPC8260ADS powerpc mpc8260 mpc8260ads freescale
  1717 + echo "TEXT_BASE = 0xFF800000" >$(obj)board/freescale/mpc8260ads/config.tmp
  1718 + @$(MKCONFIG) -n $@ -a MPC8260ADS powerpc mpc8260 mpc8260ads freescale
1830 1719  
1831 1720 MPC8266ADS_config: unconfig
1832 1721 @$(MKCONFIG) $(@:_config=) powerpc mpc8260 mpc8266ads freescale
... ... @@ -1838,7 +1727,7 @@
1838 1727 @if [ "$(findstring dev,$@)" ] ; then \
1839 1728 echo "#define CONFIG_MUAS_DEV_BOARD" > $(obj)include/config.h ; \
1840 1729 fi
1841   - @$(MKCONFIG) -a muas3001 powerpc mpc8260 muas3001
  1730 + @$(MKCONFIG) -n $@ -a muas3001 powerpc mpc8260 muas3001
1842 1731  
1843 1732 # PM825/PM826 default configuration: small (= 8 MB) Flash / boot from 64-bit flash
1844 1733 PM825_config \
1845 1734  
1846 1735  
... ... @@ -1857,15 +1746,12 @@
1857 1746 >$(obj)include/config.h ; \
1858 1747 fi
1859 1748 @if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
1860   - $(XECHO) "... booting from 8-bit flash" ; \
1861 1749 echo "#define CONFIG_BOOT_ROM" >>$(obj)include/config.h ; \
1862 1750 echo "TEXT_BASE = 0xFF800000" >$(obj)board/pm826/config.tmp ; \
1863 1751 if [ "$(findstring _BIGFLASH_,$@)" ] ; then \
1864   - $(XECHO) "... with 32 MB Flash" ; \
1865 1752 echo "#define CONFIG_FLASH_32MB" >>$(obj)include/config.h ; \
1866 1753 fi; \
1867 1754 else \
1868   - $(XECHO) "... booting from 64-bit flash" ; \
1869 1755 if [ "$(findstring _BIGFLASH_,$@)" ] ; then \
1870 1756 $(XECHO) "... with 32 MB Flash" ; \
1871 1757 echo "#define CONFIG_FLASH_32MB" >>$(obj)include/config.h ; \
... ... @@ -1874,7 +1760,7 @@
1874 1760 echo "TEXT_BASE = 0xFF000000" >$(obj)board/pm826/config.tmp ; \
1875 1761 fi; \
1876 1762 fi
1877   - @$(MKCONFIG) -a PM826 powerpc mpc8260 pm826
  1763 + @$(MKCONFIG) -n $@ -a PM826 powerpc mpc8260 pm826
1878 1764  
1879 1765 PM828_config \
1880 1766 PM828_PCI_config \
1881 1767  
1882 1768  
... ... @@ -1884,14 +1770,12 @@
1884 1770 @mkdir -p $(obj)board/pm826
1885 1771 @if [ "$(findstring _PCI_,$@)" ] ; then \
1886 1772 echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
1887   - $(XECHO) "... with PCI enabled" ; \
1888 1773 fi
1889 1774 @if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
1890   - $(XECHO) "... booting from 8-bit flash" ; \
1891 1775 echo "#define CONFIG_BOOT_ROM" >>$(obj)include/config.h ; \
1892 1776 echo "TEXT_BASE = 0xFF800000" >$(obj)board/pm826/config.tmp ; \
1893 1777 fi
1894   - @$(MKCONFIG) -a PM828 powerpc mpc8260 pm828
  1778 + @$(MKCONFIG) -n $@ -a PM828 powerpc mpc8260 pm828
1895 1779  
1896 1780 ppmc8260_config: unconfig
1897 1781 @$(MKCONFIG) $(@:_config=) powerpc mpc8260 ppmc8260
... ... @@ -1900,8 +1784,8 @@
1900 1784 Rattler_config: unconfig
1901 1785 @mkdir -p $(obj)include
1902 1786 $(if $(findstring 8248,$@), \
1903   - @echo "#define CONFIG_MPC8248" > $(obj)include/config.h)
1904   - @$(MKCONFIG) -a Rattler powerpc mpc8260 rattler
  1787 + @echo "#define CONFIG_MPC8248" > $(obj)include/config.h)
  1788 + @$(MKCONFIG) -n $@ -a Rattler powerpc mpc8260 rattler
1905 1789  
1906 1790 RPXsuper_config: unconfig
1907 1791 @$(MKCONFIG) $(@:_config=) powerpc mpc8260 rpxsuper
1908 1792  
1909 1793  
1910 1794  
1911 1795  
1912 1796  
... ... @@ -1947,22 +1831,17 @@
1947 1831 echo "#define CONFIG_$${CTYPE}" >>$(obj)include/config.h ; \
1948 1832 fi; \
1949 1833 echo "#define CONFIG_$${CFREQ}MHz" >>$(obj)include/config.h ; \
1950   - echo "... with $${CFREQ}MHz system clock" ; \
1951 1834 if [ "$${CACHE}" = "yes" ] ; then \
1952 1835 echo "#define CONFIG_L2_CACHE" >>$(obj)include/config.h ; \
1953   - $(XECHO) "... with L2 Cache support" ; \
1954 1836 else \
1955 1837 echo "#undef CONFIG_L2_CACHE" >>$(obj)include/config.h ; \
1956   - $(XECHO) "... without L2 Cache support" ; \
1957 1838 fi; \
1958 1839 if [ "$${BMODE}" = "60x" ] ; then \
1959 1840 echo "#define CONFIG_BUSMODE_60x" >>$(obj)include/config.h ; \
1960   - $(XECHO) "... with 60x Bus Mode" ; \
1961 1841 else \
1962 1842 echo "#undef CONFIG_BUSMODE_60x" >>$(obj)include/config.h ; \
1963   - $(XECHO) "... without 60x Bus Mode" ; \
1964 1843 fi
1965   - @$(MKCONFIG) -a TQM8260 powerpc mpc8260 tqm8260 tqc
  1844 + @$(MKCONFIG) -n $@ -a TQM8260 powerpc mpc8260 tqm8260 tqc
1966 1845  
1967 1846 TQM8272_config: unconfig
1968 1847 @$(MKCONFIG) TQM8272 powerpc mpc8260 tqm8272 tqc
... ... @@ -1971,7 +1850,7 @@
1971 1850 VoVPN-GW_100MHz_config: unconfig
1972 1851 @mkdir -p $(obj)include
1973 1852 @echo "#define CONFIG_CLKIN_$(word 2,$(subst _, ,$@))" > $(obj)include/config.h
1974   - @$(MKCONFIG) -a VoVPN-GW powerpc mpc8260 vovpn-gw funkwerk
  1853 + @$(MKCONFIG) -n $@ -a VoVPN-GW powerpc mpc8260 vovpn-gw funkwerk
1975 1854  
1976 1855 ZPC1900_config: unconfig
1977 1856 @$(MKCONFIG) $(@:_config=) powerpc mpc8260 zpc1900
... ... @@ -1982,7 +1861,7 @@
1982 1861  
1983 1862 astro_mcf5373l_config \
1984 1863 astro_mcf5373l_RAM_config : unconfig
1985   - @$(MKCONFIG) -t $(@:_config=) astro_mcf5373l m68k mcf532x mcf5373l astro
  1864 + @$(MKCONFIG) -n $@ -t $(@:_config=) astro_mcf5373l m68k mcf532x mcf5373l astro
1986 1865  
1987 1866 M5208EVBE_config : unconfig
1988 1867 @$(MKCONFIG) $(@:_config=) m68k mcf52x2 m5208evbe freescale
1989 1868  
1990 1869  
... ... @@ -1999,16 +1878,14 @@
1999 1878 echo "#define CONFIG_SYS_SPANSION_BOOT" >> $(obj)include/config.h ; \
2000 1879 echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m52277evb/config.tmp ; \
2001 1880 cp $(obj)board/freescale/m52277evb/u-boot.spa $(obj)board/freescale/m52277evb/u-boot.lds ; \
2002   - $(XECHO) "... with SPANSION boot..." ; \
2003 1881 fi; \
2004 1882 if [ "$${FLASH}" = "STMICRO" ] ; then \
2005 1883 echo "#define CONFIG_CF_SBF" >> $(obj)include/config.h ; \
2006 1884 echo "#define CONFIG_SYS_STMICRO_BOOT" >> $(obj)include/config.h ; \
2007 1885 echo "TEXT_BASE = 0x43E00000" > $(obj)board/freescale/m52277evb/config.tmp ; \
2008 1886 cp $(obj)board/freescale/m52277evb/u-boot.stm $(obj)board/freescale/m52277evb/u-boot.lds ; \
2009   - $(XECHO) "... with ST Micro boot..." ; \
2010 1887 fi
2011   - @$(MKCONFIG) -a M52277EVB m68k mcf5227x m52277evb freescale
  1888 + @$(MKCONFIG) -n $@ -a M52277EVB m68k mcf5227x m52277evb freescale
2012 1889  
2013 1890 M5235EVB_config \
2014 1891 M5235EVB_Flash16_config \
... ... @@ -2026,7 +1903,7 @@
2026 1903 echo "TEXT_BASE = 0xFFE00000" > $(obj)board/freescale/m5235evb/config.tmp ; \
2027 1904 cp $(obj)board/freescale/m5235evb/u-boot.16 $(obj)board/freescale/m5235evb/u-boot.lds ; \
2028 1905 fi
2029   - @$(MKCONFIG) -a M5235EVB m68k mcf523x m5235evb freescale
  1906 + @$(MKCONFIG) -n $@ -a M5235EVB m68k mcf523x m5235evb freescale
2030 1907  
2031 1908 M5249EVB_config : unconfig
2032 1909 @$(MKCONFIG) $(@:_config=) m68k mcf52x2 m5249evb freescale
2033 1910  
... ... @@ -2044,13 +1921,13 @@
2044 1921 @mkdir -p $(obj)include
2045 1922 @mkdir -p $(obj)board/BuS/EB+MCF-EV123
2046 1923 @echo "TEXT_BASE = 0xFFE00000"|tee $(obj)board/BuS/EB+MCF-EV123/textbase.mk
2047   - @$(MKCONFIG) EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
  1924 + @$(MKCONFIG) -n $@ EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
2048 1925  
2049 1926 EB+MCF-EV123_internal_config : unconfig
2050 1927 @mkdir -p $(obj)include
2051 1928 @mkdir -p $(obj)board/BuS/EB+MCF-EV123
2052 1929 @echo "TEXT_BASE = 0xF0000000"|tee $(obj)board/BuS/EB+MCF-EV123/textbase.mk
2053   - @$(MKCONFIG) EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
  1930 + @$(MKCONFIG) -n $@ EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
2054 1931  
2055 1932 EP2500_config: unconfig
2056 1933 @$(MKCONFIG) $(@:_config=) m68k mcf52x2 ep2500 Mercury
... ... @@ -2082,7 +1959,7 @@
2082 1959 if [ "$${NAND}" != "0" ] ; then \
2083 1960 echo "#define NANDFLASH_SIZE $${NAND}" > $(obj)include/config.h ; \
2084 1961 fi
2085   - @$(MKCONFIG) -a M5329EVB m68k mcf532x m5329evb freescale
  1962 + @$(MKCONFIG) -n $@ -a M5329EVB m68k mcf532x m5329evb freescale
2086 1963  
2087 1964 M5373EVB_config : unconfig
2088 1965 @case "$@" in \
2089 1966  
2090 1967  
... ... @@ -2102,17 +1979,15 @@
2102 1979 if [ "$${FLASH}" = "NOR" ] ; then \
2103 1980 echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m54451evb/config.tmp ; \
2104 1981 cp $(obj)board/freescale/m54451evb/u-boot.spa $(obj)board/freescale/m54451evb/u-boot.lds ; \
2105   - $(XECHO) "... with NOR boot..." ; \
2106 1982 fi; \
2107 1983 if [ "$${FLASH}" = "STMICRO" ] ; then \
2108 1984 echo "#define CONFIG_CF_SBF" >> $(obj)include/config.h ; \
2109 1985 echo "#define CONFIG_SYS_STMICRO_BOOT" >> $(obj)include/config.h ; \
2110 1986 echo "TEXT_BASE = 0x47E00000" > $(obj)board/freescale/m54451evb/config.tmp ; \
2111 1987 cp $(obj)board/freescale/m54451evb/u-boot.stm $(obj)board/freescale/m54451evb/u-boot.lds ; \
2112   - $(XECHO) "... with ST Micro boot..." ; \
2113 1988 fi; \
2114 1989 echo "#define CONFIG_SYS_INPUT_CLKSRC 24000000" >> $(obj)include/config.h ;
2115   - @$(MKCONFIG) -a M54451EVB m68k mcf5445x m54451evb freescale
  1990 + @$(MKCONFIG) -n $@ -a M54451EVB m68k mcf5445x m54451evb freescale
2116 1991  
2117 1992 M54455EVB_config \
2118 1993 M54455EVB_atmel_config \
2119 1994  
2120 1995  
2121 1996  
... ... @@ -2136,24 +2011,20 @@
2136 2011 echo "#define CONFIG_SYS_INTEL_BOOT" >> $(obj)include/config.h ; \
2137 2012 echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m54455evb/config.tmp ; \
2138 2013 cp $(obj)board/freescale/m54455evb/u-boot.int $(obj)board/freescale/m54455evb/u-boot.lds ; \
2139   - $(XECHO) "... with INTEL boot..." ; \
2140 2014 fi; \
2141 2015 if [ "$${FLASH}" = "ATMEL" ] ; then \
2142 2016 echo "#define CONFIG_SYS_ATMEL_BOOT" >> $(obj)include/config.h ; \
2143 2017 echo "TEXT_BASE = 0x04000000" > $(obj)board/freescale/m54455evb/config.tmp ; \
2144 2018 cp $(obj)board/freescale/m54455evb/u-boot.atm $(obj)board/freescale/m54455evb/u-boot.lds ; \
2145   - $(XECHO) "... with ATMEL boot..." ; \
2146 2019 fi; \
2147 2020 if [ "$${FLASH}" = "STMICRO" ] ; then \
2148 2021 echo "#define CONFIG_CF_SBF" >> $(obj)include/config.h ; \
2149 2022 echo "#define CONFIG_SYS_STMICRO_BOOT" >> $(obj)include/config.h ; \
2150 2023 echo "TEXT_BASE = 0x4FE00000" > $(obj)board/freescale/m54455evb/config.tmp ; \
2151 2024 cp $(obj)board/freescale/m54455evb/u-boot.stm $(obj)board/freescale/m54455evb/u-boot.lds ; \
2152   - $(XECHO) "... with ST Micro boot..." ; \
2153 2025 fi; \
2154 2026 echo "#define CONFIG_SYS_INPUT_CLKSRC $${FREQ}" >> $(obj)include/config.h ; \
2155   - $(XECHO) "... with $${FREQ}Hz input clock"
2156   - @$(MKCONFIG) -a M54455EVB m68k mcf5445x m54455evb freescale
  2027 + @$(MKCONFIG) -n $@ -a M54455EVB m68k mcf5445x m54455evb freescale
2157 2028  
2158 2029 M5475AFE_config \
2159 2030 M5475BFE_config \
... ... @@ -2186,7 +2057,7 @@
2186 2057 if [ "$${USB}" == "1" ] ; then \
2187 2058 echo "#define CONFIG_SYS_USBCTRL" >> $(obj)include/config.h ; \
2188 2059 fi
2189   - @$(MKCONFIG) -a M5475EVB m68k mcf547x_8x m547xevb freescale
  2060 + @$(MKCONFIG) -n $@ -a M5475EVB m68k mcf547x_8x m547xevb freescale
2190 2061  
2191 2062 M5485AFE_config \
2192 2063 M5485BFE_config \
... ... @@ -2221,7 +2092,7 @@
2221 2092 if [ "$${USB}" == "1" ] ; then \
2222 2093 echo "#define CONFIG_SYS_USBCTRL" >> $(obj)include/config.h ; \
2223 2094 fi
2224   - @$(MKCONFIG) -a M5485EVB m68k mcf547x_8x m548xevb freescale
  2095 + @$(MKCONFIG) -n $@ -a M5485EVB m68k mcf547x_8x m548xevb freescale
2225 2096  
2226 2097 TASREG_config : unconfig
2227 2098 @$(MKCONFIG) $(@:_config=) m68k mcf52x2 tasreg esd
2228 2099  
2229 2100  
2230 2101  
2231 2102  
2232 2103  
... ... @@ -2240,26 +2111,23 @@
2240 2111 @mkdir -p $(obj)include
2241 2112 @mkdir -p $(obj)board/freescale/mpc8313erdb
2242 2113 @if [ "$(findstring _33_,$@)" ] ; then \
2243   - $(XECHO) -n "...33M ..." ; \
2244 2114 echo "#define CONFIG_SYS_33MHZ" >>$(obj)include/config.h ; \
2245 2115 fi ; \
2246 2116 if [ "$(findstring _66_,$@)" ] ; then \
2247   - $(XECHO) -n "...66M..." ; \
2248 2117 echo "#define CONFIG_SYS_66MHZ" >>$(obj)include/config.h ; \
2249 2118 fi ; \
2250 2119 if [ "$(findstring _NAND_,$@)" ] ; then \
2251   - $(XECHO) -n "...NAND..." ; \
2252 2120 echo "TEXT_BASE = 0x00100000" > $(obj)board/freescale/mpc8313erdb/config.tmp ; \
2253 2121 echo "#define CONFIG_NAND_U_BOOT" >>$(obj)include/config.h ; \
2254 2122 fi ;
2255   - @$(MKCONFIG) -a MPC8313ERDB powerpc mpc83xx mpc8313erdb freescale
2256 2123 @if [ "$(findstring _NAND_,$@)" ] ; then \
2257 2124 echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk ; \
2258 2125 fi ;
  2126 + @$(MKCONFIG) -n $@ -a MPC8313ERDB powerpc mpc83xx mpc8313erdb freescale
2259 2127  
2260 2128 MPC8315ERDB_NAND_config \
2261 2129 MPC8315ERDB_config: unconfig
2262   - @$(MKCONFIG) -t $(@:_config=) MPC8315ERDB powerpc mpc83xx mpc8315erdb freescale
  2130 + @$(MKCONFIG) -n $@ -t $(@:_config=) MPC8315ERDB powerpc mpc83xx mpc8315erdb freescale
2263 2131  
2264 2132 MPC8323ERDB_config: unconfig
2265 2133 @$(MKCONFIG) -a MPC8323ERDB powerpc mpc83xx mpc8323erdb freescale
2266 2134  
2267 2135  
2268 2136  
2269 2137  
2270 2138  
... ... @@ -2271,30 +2139,25 @@
2271 2139 MPC832XEMDS_ATM_config: unconfig
2272 2140 @mkdir -p $(obj)include
2273 2141 @if [ "$(findstring _HOST_,$@)" ] ; then \
2274   - $(XECHO) -n "... PCI HOST " ; \
2275 2142 echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
2276 2143 fi ; \
2277 2144 if [ "$(findstring _SLAVE_,$@)" ] ; then \
2278   - $(XECHO) "...PCI SLAVE 66M" ; \
2279 2145 echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
2280 2146 echo "#define CONFIG_PCISLAVE" >>$(obj)include/config.h ; \
2281 2147 fi ; \
2282 2148 if [ "$(findstring _33_,$@)" ] ; then \
2283   - $(XECHO) -n "...33M ..." ; \
2284 2149 echo "#define PCI_33M" >>$(obj)include/config.h ; \
2285 2150 echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
2286 2151 fi ; \
2287 2152 if [ "$(findstring _66_,$@)" ] ; then \
2288   - $(XECHO) -n "...66M..." ; \
2289 2153 echo "#define PCI_66M" >>$(obj)include/config.h ; \
2290 2154 echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
2291 2155 fi ; \
2292 2156 if [ "$(findstring _ATM_,$@)" ] ; then \
2293   - $(XECHO) -n "...ATM..." ; \
2294 2157 echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
2295 2158 echo "#define CONFIG_PQ_MDS_PIB_ATM 1" >>$(obj)include/config.h ; \
2296 2159 fi ;
2297   - @$(MKCONFIG) -a MPC832XEMDS powerpc mpc83xx mpc832xemds freescale
  2160 + @$(MKCONFIG) -n $@ -a MPC832XEMDS powerpc mpc83xx mpc832xemds freescale
2298 2161  
2299 2162 MPC8349EMDS_config: unconfig
2300 2163 @$(MKCONFIG) $(@:_config=) powerpc mpc83xx mpc8349emds freescale
... ... @@ -2311,7 +2174,7 @@
2311 2174 @if [ "$(findstring LOWBOOT,$@)" ] ; then \
2312 2175 echo "TEXT_BASE = 0xFE000000" >$(obj)board/freescale/mpc8349itx/config.tmp ; \
2313 2176 fi
2314   - @$(MKCONFIG) -a -n $(@:_config=) MPC8349ITX powerpc mpc83xx mpc8349itx freescale
  2177 + @$(MKCONFIG) -n $@ -a MPC8349ITX powerpc mpc83xx mpc8349itx freescale
2315 2178  
2316 2179 MPC8360EMDS_config \
2317 2180 MPC8360EMDS_HOST_33_config \
2318 2181  
2319 2182  
2320 2183  
2321 2184  
2322 2185  
2323 2186  
2324 2187  
2325 2188  
2326 2189  
... ... @@ -2320,49 +2183,42 @@
2320 2183 MPC8360EMDS_ATM_config: unconfig
2321 2184 @mkdir -p $(obj)include
2322 2185 @if [ "$(findstring _HOST_,$@)" ] ; then \
2323   - $(XECHO) -n "... PCI HOST " ; \
2324 2186 echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
2325 2187 fi ; \
2326 2188 if [ "$(findstring _SLAVE_,$@)" ] ; then \
2327   - $(XECHO) "...PCI SLAVE 66M" ; \
2328 2189 echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
2329 2190 echo "#define CONFIG_PCISLAVE" >>$(obj)include/config.h ; \
2330 2191 fi ; \
2331 2192 if [ "$(findstring _33_,$@)" ] ; then \
2332   - $(XECHO) -n "...33M ..." ; \
2333 2193 echo "#define PCI_33M" >>$(obj)include/config.h ; \
2334 2194 echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
2335 2195 fi ; \
2336 2196 if [ "$(findstring _66_,$@)" ] ; then \
2337   - $(XECHO) -n "...66M..." ; \
2338 2197 echo "#define PCI_66M" >>$(obj)include/config.h ; \
2339 2198 echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
2340 2199 fi ; \
2341 2200 if [ "$(findstring _ATM_,$@)" ] ; then \
2342   - $(XECHO) -n "...ATM..." ; \
2343 2201 echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
2344 2202 echo "#define CONFIG_PQ_MDS_PIB_ATM 1" >>$(obj)include/config.h ; \
2345 2203 fi ;
2346   - @$(MKCONFIG) -a MPC8360EMDS powerpc mpc83xx mpc8360emds freescale
  2204 + @$(MKCONFIG) -n $@ -a MPC8360EMDS powerpc mpc83xx mpc8360emds freescale
2347 2205  
2348 2206 MPC8360ERDK_33_config \
2349 2207 MPC8360ERDK_66_config \
2350 2208 MPC8360ERDK_config: unconfig
2351 2209 @mkdir -p $(obj)include
2352 2210 @if [ "$(findstring _33_,$@)" ] ; then \
2353   - $(XECHO) -n "... CLKIN 33MHz " ; \
2354 2211 echo "#define CONFIG_CLKIN_33MHZ" >>$(obj)include/config.h ;\
2355 2212 fi ;
2356   - @$(MKCONFIG) -a MPC8360ERDK powerpc mpc83xx mpc8360erdk freescale
  2213 + @$(MKCONFIG) -n $@ -a MPC8360ERDK powerpc mpc83xx mpc8360erdk freescale
2357 2214  
2358 2215 MPC837XEMDS_config \
2359 2216 MPC837XEMDS_HOST_config: unconfig
2360 2217 @mkdir -p $(obj)include
2361 2218 @if [ "$(findstring _HOST_,$@)" ] ; then \
2362   - $(XECHO) -n "... PCI HOST " ; \
2363 2219 echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
2364 2220 fi ;
2365   - @$(MKCONFIG) -a MPC837XEMDS powerpc mpc83xx mpc837xemds freescale
  2221 + @$(MKCONFIG) -n $@ -a MPC837XEMDS powerpc mpc83xx mpc837xemds freescale
2366 2222  
2367 2223 MPC837XERDB_config: unconfig
2368 2224 @$(MKCONFIG) -a MPC837XERDB powerpc mpc83xx mpc837xerdb freescale
2369 2225  
2370 2226  
2371 2227  
2372 2228  
2373 2229  
... ... @@ -2373,29 +2229,27 @@
2373 2229 sbc8349_config \
2374 2230 sbc8349_PCI_33_config \
2375 2231 sbc8349_PCI_66_config: unconfig
2376   - @$(MKCONFIG) -t $(@:_config=) sbc8349 powerpc mpc83xx sbc8349
  2232 + @$(MKCONFIG) -n $@ -t $(@:_config=) sbc8349 powerpc mpc83xx sbc8349
2377 2233  
2378 2234 SIMPC8313_LP_config \
2379 2235 SIMPC8313_SP_config: unconfig
2380 2236 @mkdir -p $(obj)include
2381 2237 @mkdir -p $(obj)board/sheldon/simpc8313
2382 2238 @if [ "$(findstring _LP_,$@)" ] ; then \
2383   - $(XECHO) -n "...Large Page NAND..." ; \
2384 2239 echo "#define CONFIG_NAND_LP" >> $(obj)include/config.h ; \
2385 2240 fi ; \
2386 2241 if [ "$(findstring _SP_,$@)" ] ; then \
2387   - $(XECHO) -n "...Small Page NAND..." ; \
2388 2242 echo "#define CONFIG_NAND_SP" >> $(obj)include/config.h ; \
2389 2243 fi ;
2390   - @$(MKCONFIG) -a SIMPC8313 powerpc mpc83xx simpc8313 sheldon
2391 2244 @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
  2245 + @$(MKCONFIG) -n $@ -a SIMPC8313 powerpc mpc83xx simpc8313 sheldon
2392 2246  
2393 2247 TQM834x_config: unconfig
2394 2248 @$(MKCONFIG) $(@:_config=) powerpc mpc83xx tqm834x tqc
2395 2249  
2396 2250 caddy2_config \
2397 2251 vme8349_config: unconfig
2398   - @$(MKCONFIG) -t $(@:_config=) vme8349 powerpc mpc83xx vme8349 esd
  2252 + @$(MKCONFIG) -n $@ -t $(@:_config=) vme8349 powerpc mpc83xx vme8349 esd
2399 2253  
2400 2254 edb9301_config \
2401 2255 edb9302_config \
... ... @@ -2405,7 +2259,7 @@
2405 2259 edb9312_config \
2406 2260 edb9315_config \
2407 2261 edb9315a_config: unconfig
2408   - @$(MKCONFIG) -t $(@:_config=) edb93xx arm arm920t edb93xx NULL ep93xx
  2262 + @$(MKCONFIG) -n $@ -t $(@:_config=) edb93xx arm arm920t edb93xx NULL ep93xx
2409 2263  
2410 2264 #########################################################################
2411 2265 ## MPC85xx Systems
... ... @@ -2419,7 +2273,7 @@
2419 2273 MPC8536DS_SPIFLASH_config \
2420 2274 MPC8536DS_36BIT_config \
2421 2275 MPC8536DS_config: unconfig
2422   - @$(MKCONFIG) -t $(@:_config=) MPC8536DS powerpc mpc85xx mpc8536ds freescale
  2276 + @$(MKCONFIG) -n $@ -t $(@:_config=) MPC8536DS powerpc mpc85xx mpc8536ds freescale
2423 2277  
2424 2278 MPC8540ADS_config: unconfig
2425 2279 @$(MKCONFIG) $(@:_config=) powerpc mpc85xx mpc8540ads freescale
2426 2280  
2427 2281  
2428 2282  
2429 2283  
... ... @@ -2428,21 +2282,15 @@
2428 2282 MPC8540EVAL_33_config \
2429 2283 MPC8540EVAL_66_config \
2430 2284 MPC8540EVAL_33_slave_config \
2431   -MPC8540EVAL_66_slave_config: unconfig
  2285 +MPC8540EVAL_66_slave_config: unconfig
2432 2286 @mkdir -p $(obj)include
2433   - @if [ "$(findstring _33_,$@)" ] ; then \
2434   - $(XECHO) "... 33 MHz PCI" ; \
2435   - else \
  2287 + @if [ -z "$(findstring _33_,$@)" ] ; then \
2436 2288 echo "#define CONFIG_SYSCLK_66M" >>$(obj)include/config.h ; \
2437   - $(XECHO) "... 66 MHz PCI" ; \
2438 2289 fi ; \
2439 2290 if [ "$(findstring _slave_,$@)" ] ; then \
2440 2291 echo "#define CONFIG_PCI_SLAVE" >>$(obj)include/config.h ; \
2441   - $(XECHO) " slave" ; \
2442   - else \
2443   - $(XECHO) " host" ; \
2444 2292 fi
2445   - @$(MKCONFIG) -a MPC8540EVAL powerpc mpc85xx mpc8540eval
  2293 + @$(MKCONFIG) -n $@ -a MPC8540EVAL powerpc mpc85xx mpc8540eval
2446 2294  
2447 2295 MPC8560ADS_config: unconfig
2448 2296 @$(MKCONFIG) $(@:_config=) powerpc mpc85xx mpc8560ads freescale
2449 2297  
... ... @@ -2452,9 +2300,8 @@
2452 2300 @mkdir -p $(obj)include
2453 2301 @if [ "$(findstring _legacy_,$@)" ] ; then \
2454 2302 echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
2455   - $(XECHO) "... legacy" ; \
2456 2303 fi
2457   - @$(MKCONFIG) -a MPC8541CDS powerpc mpc85xx mpc8541cds freescale
  2304 + @$(MKCONFIG) -n $@ -a MPC8541CDS powerpc mpc85xx mpc8541cds freescale
2458 2305  
2459 2306 MPC8544DS_config: unconfig
2460 2307 @$(MKCONFIG) $(@:_config=) powerpc mpc85xx mpc8544ds freescale
2461 2308  
2462 2309  
2463 2310  
... ... @@ -2464,18 +2311,16 @@
2464 2311 @mkdir -p $(obj)include
2465 2312 @if [ "$(findstring _legacy_,$@)" ] ; then \
2466 2313 echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
2467   - $(XECHO) "... legacy" ; \
2468 2314 fi
2469   - @$(MKCONFIG) -a MPC8548CDS powerpc mpc85xx mpc8548cds freescale
  2315 + @$(MKCONFIG) -n $@ -a MPC8548CDS powerpc mpc85xx mpc8548cds freescale
2470 2316  
2471 2317 MPC8555CDS_legacy_config \
2472 2318 MPC8555CDS_config: unconfig
2473 2319 @mkdir -p $(obj)include
2474 2320 @if [ "$(findstring _legacy_,$@)" ] ; then \
2475 2321 echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
2476   - $(XECHO) "... legacy" ; \
2477 2322 fi
2478   - @$(MKCONFIG) -a MPC8555CDS powerpc mpc85xx mpc8555cds freescale
  2323 + @$(MKCONFIG) -n $@ -a MPC8555CDS powerpc mpc85xx mpc8555cds freescale
2479 2324  
2480 2325 MPC8568MDS_config: unconfig
2481 2326 @$(MKCONFIG) $(@:_config=) powerpc mpc85xx mpc8568mds freescale
2482 2327  
2483 2328  
... ... @@ -2483,15 +2328,15 @@
2483 2328 MPC8569MDS_ATM_config \
2484 2329 MPC8569MDS_NAND_config \
2485 2330 MPC8569MDS_config: unconfig
2486   - @$(MKCONFIG) -t $(@:_config=) MPC8569MDS powerpc mpc85xx mpc8569mds freescale
  2331 + @$(MKCONFIG) -n $@ -t $(@:_config=) MPC8569MDS powerpc mpc85xx mpc8569mds freescale
2487 2332  
2488 2333 MPC8572DS_36BIT_config \
2489 2334 MPC8572DS_config: unconfig
2490   - @$(MKCONFIG) -t $(@:_config=) MPC8572DS powerpc mpc85xx mpc8572ds freescale
  2335 + @$(MKCONFIG) -n $@ -t $(@:_config=) MPC8572DS powerpc mpc85xx mpc8572ds freescale
2491 2336  
2492 2337 P2020DS_36BIT_config \
2493 2338 P2020DS_config: unconfig
2494   - @$(MKCONFIG) -t $(@:_config=) P2020DS powerpc mpc85xx p2020ds freescale
  2339 + @$(MKCONFIG) -n $@ -t $(@:_config=) P2020DS powerpc mpc85xx p2020ds freescale
2495 2340  
2496 2341 P1011RDB_config \
2497 2342 P1011RDB_NAND_config \
... ... @@ -2509,7 +2354,7 @@
2509 2354 P2020RDB_NAND_config \
2510 2355 P2020RDB_SDCARD_config \
2511 2356 P2020RDB_SPIFLASH_config: unconfig
2512   - @$(MKCONFIG) -t $(@:_config=) P1_P2_RDB powerpc mpc85xx p1_p2_rdb freescale
  2357 + @$(MKCONFIG) -n $@ -t $(@:_config=) P1_P2_RDB powerpc mpc85xx p1_p2_rdb freescale
2513 2358  
2514 2359 PM854_config: unconfig
2515 2360 @$(MKCONFIG) $(@:_config=) powerpc mpc85xx pm854
2516 2361  
2517 2362  
... ... @@ -2520,19 +2365,19 @@
2520 2365 sbc8540_config \
2521 2366 sbc8540_33_config \
2522 2367 sbc8540_66_config: unconfig
2523   - @$(MKCONFIG) -t $(@:_config=) SBC8540 powerpc mpc85xx sbc8560
  2368 + @$(MKCONFIG) -n $@ -t $(@:_config=) SBC8540 powerpc mpc85xx sbc8560
2524 2369  
2525 2370 sbc8548_config \
2526 2371 sbc8548_PCI_33_config \
2527 2372 sbc8548_PCI_66_config \
2528 2373 sbc8548_PCI_33_PCIE_config \
2529 2374 sbc8548_PCI_66_PCIE_config: unconfig
2530   - @$(MKCONFIG) -t $(@:_config=) sbc8548 powerpc mpc85xx sbc8548
  2375 + @$(MKCONFIG) -n $@ -t $(@:_config=) sbc8548 powerpc mpc85xx sbc8548
2531 2376  
2532 2377 sbc8560_config \
2533 2378 sbc8560_33_config \
2534 2379 sbc8560_66_config: unconfig
2535   - @$(MKCONFIG) -t $(@:_config=) sbc8560 powerpc mpc85xx sbc8560
  2380 + @$(MKCONFIG) -n $@ -t $(@:_config=) sbc8560 powerpc mpc85xx sbc8560
2536 2381  
2537 2382 socrates_config: unconfig
2538 2383 @$(MKCONFIG) $(@:_config=) powerpc mpc85xx socrates
2539 2384  
... ... @@ -2545,9 +2390,8 @@
2545 2390 @mkdir -p $(obj)include
2546 2391 @if [ "$(findstring _4M_,$@)" ] ; then \
2547 2392 echo "#define CONFIG_STXSSA_4M" >>$(obj)include/config.h ; \
2548   - $(XECHO) "... with 4 MiB flash memory" ; \
2549 2393 fi
2550   - @$(MKCONFIG) -a stxssa powerpc mpc85xx stxssa stx
  2394 + @$(MKCONFIG) -n $@ -a stxssa powerpc mpc85xx stxssa stx
2551 2395  
2552 2396 TQM8540_config \
2553 2397 TQM8541_config \
2554 2398  
2555 2399  
... ... @@ -2559,13 +2403,12 @@
2559 2403 @mkdir -p $(obj)include
2560 2404 @BTYPE=$(@:_config=); \
2561 2405 CTYPE=$(subst TQM,,$(subst _AG,,$(subst _BE,,$(@:_config=)))); \
2562   - $(XECHO) "... "$${BTYPE}" (MPC"$${CTYPE}")"; \
2563 2406 echo "#define CONFIG_MPC$${CTYPE}">>$(obj)include/config.h; \
2564 2407 echo "#define CONFIG_$${BTYPE}">>$(obj)include/config.h; \
2565 2408 echo "#define CONFIG_HOSTNAME tqm$${CTYPE}">>$(obj)include/config.h; \
2566 2409 echo "#define CONFIG_BOARDNAME \"$${BTYPE}\"">>$(obj)include/config.h;
2567   - @$(MKCONFIG) -a TQM85xx powerpc mpc85xx tqm85xx tqc
2568 2410 @echo "CONFIG_$(@:_config=) = y">>$(obj)include/config.mk;
  2411 + @$(MKCONFIG) -n $@ -a TQM85xx powerpc mpc85xx tqm85xx tqc
2569 2412  
2570 2413 XPEDITE5200_config: unconfig
2571 2414 @$(MKCONFIG) $(@:_config=) powerpc mpc85xx xpedite5200 xes
2572 2415  
... ... @@ -2585,9 +2428,8 @@
2585 2428 @mkdir -p $(obj)include
2586 2429 @if [ "$(findstring _36BIT_,$@)" ] ; then \
2587 2430 echo "#define CONFIG_PHYS_64BIT" >>$(obj)include/config.h ; \
2588   - $(XECHO) "... enabling 36-bit physical addressing." ; \
2589 2431 fi
2590   - @$(MKCONFIG) -a MPC8641HPCN powerpc mpc86xx mpc8641hpcn freescale
  2432 + @$(MKCONFIG) -n $@ -a MPC8641HPCN powerpc mpc86xx mpc8641hpcn freescale
2591 2433  
2592 2434 sbc8641d_config: unconfig
2593 2435 @$(MKCONFIG) $(@:_config=) powerpc mpc86xx sbc8641d
... ... @@ -2619,7 +2461,7 @@
2619 2461  
2620 2462 EVB64260_config \
2621 2463 EVB64260_750CX_config: unconfig
2622   - @$(MKCONFIG) EVB64260 powerpc 74xx_7xx evb64260
  2464 + @$(MKCONFIG) -n $@ EVB64260 powerpc 74xx_7xx evb64260
2623 2465  
2624 2466 mpc7448hpc2_config: unconfig
2625 2467 @$(MKCONFIG) $(@:_config=) powerpc 74xx_7xx mpc7448hpc2 freescale
2626 2468  
... ... @@ -2635,11 +2477,11 @@
2635 2477 else \
2636 2478 echo "#define CONFIG_P3M7448" >>$(obj)include/config.h ; \
2637 2479 fi
2638   - @$(MKCONFIG) -a p3mx powerpc 74xx_7xx p3mx prodrive
  2480 + @$(MKCONFIG) -n $@ -a p3mx powerpc 74xx_7xx p3mx prodrive
2639 2481  
2640 2482 PCIPPC2_config \
2641 2483 PCIPPC6_config: unconfig
2642   - @$(MKCONFIG) $(@:_config=) powerpc 74xx_7xx pcippc2
  2484 + @$(MKCONFIG) -n $@ $(@:_config=) powerpc 74xx_7xx pcippc2
2643 2485  
2644 2486 ppmc7xx_config: unconfig
2645 2487 @$(MKCONFIG) $(@:_config=) powerpc 74xx_7xx ppmc7xx
... ... @@ -2693,7 +2535,7 @@
2693 2535 CPUAT91_config : unconfig
2694 2536 @mkdir -p $(obj)include
2695 2537 @echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
2696   - @$(MKCONFIG) -a cpuat91 arm arm920t cpuat91 eukrea at91rm9200
  2538 + @$(MKCONFIG) -n $@ -a cpuat91 arm arm920t cpuat91 eukrea at91rm9200
2697 2539  
2698 2540 csb637_config : unconfig
2699 2541 @$(MKCONFIG) $(@:_config=) arm arm920t csb637 NULL at91rm9200
2700 2542  
2701 2543  
2702 2544  
2703 2545  
... ... @@ -2731,21 +2573,17 @@
2731 2573 @mkdir -p $(obj)include
2732 2574 @if [ "$(findstring 9g20,$@)" ] ; then \
2733 2575 echo "#define CONFIG_AT91SAM9G20EK 1" >>$(obj)include/config.h ; \
2734   - $(XECHO) "... 9G20 Variant" ; \
2735 2576 else \
2736 2577 echo "#define CONFIG_AT91SAM9260EK 1" >>$(obj)include/config.h ; \
2737 2578 fi;
2738 2579 @if [ "$(findstring _nandflash,$@)" ] ; then \
2739 2580 echo "#define CONFIG_SYS_USE_NANDFLASH 1" >>$(obj)include/config.h ; \
2740   - $(XECHO) "... with environment variable in NAND FLASH" ; \
2741 2581 elif [ "$(findstring dataflash_cs0,$@)" ] ; then \
2742 2582 echo "#define CONFIG_SYS_USE_DATAFLASH_CS0 1" >>$(obj)include/config.h ; \
2743   - $(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \
2744 2583 else \
2745 2584 echo "#define CONFIG_SYS_USE_DATAFLASH_CS1 1" >>$(obj)include/config.h ; \
2746   - $(XECHO) "... with environment variable in SPI DATAFLASH CS1" ; \
2747 2585 fi;
2748   - @$(MKCONFIG) -a at91sam9260ek arm arm926ejs at91sam9260ek atmel at91
  2586 + @$(MKCONFIG) -n $@ -a at91sam9260ek arm arm926ejs at91sam9260ek atmel at91
2749 2587  
2750 2588 at91sam9xeek_nandflash_config \
2751 2589 at91sam9xeek_dataflash_cs0_config \
2752 2590  
2753 2591  
2754 2592  
... ... @@ -2754,15 +2592,12 @@
2754 2592 @mkdir -p $(obj)include
2755 2593 @if [ "$(findstring _nandflash,$@)" ] ; then \
2756 2594 echo "#define CONFIG_SYS_USE_NANDFLASH 1" >>$(obj)include/config.h ; \
2757   - $(XECHO) "... with environment variable in NAND FLASH" ; \
2758 2595 elif [ "$(findstring dataflash_cs0,$@)" ] ; then \
2759 2596 echo "#define CONFIG_SYS_USE_DATAFLASH_CS0 1" >>$(obj)include/config.h ; \
2760   - $(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \
2761 2597 else \
2762 2598 echo "#define CONFIG_SYS_USE_DATAFLASH_CS1 1" >>$(obj)include/config.h ; \
2763   - $(XECHO) "... with environment variable in SPI DATAFLASH CS1" ; \
2764 2599 fi;
2765   - @$(MKCONFIG) -n at91sam9xeek -a at91sam9260ek arm arm926ejs at91sam9260ek atmel at91
  2600 + @$(MKCONFIG) -n $@ -a at91sam9260ek arm arm926ejs at91sam9260ek atmel at91
2766 2601  
2767 2602 at91sam9261ek_nandflash_config \
2768 2603 at91sam9261ek_dataflash_cs0_config \
2769 2604  
2770 2605  
2771 2606  
2772 2607  
... ... @@ -2775,21 +2610,17 @@
2775 2610 @mkdir -p $(obj)include
2776 2611 @if [ "$(findstring 9g10,$@)" ] ; then \
2777 2612 echo "#define CONFIG_AT91SAM9G10EK 1" >>$(obj)include/config.h ; \
2778   - $(XECHO) "... 9G10 Variant" ; \
2779 2613 else \
2780 2614 echo "#define CONFIG_AT91SAM9261EK 1" >>$(obj)include/config.h ; \
2781 2615 fi;
2782 2616 @if [ "$(findstring _nandflash,$@)" ] ; then \
2783 2617 echo "#define CONFIG_SYS_USE_NANDFLASH 1" >>$(obj)include/config.h ; \
2784   - $(XECHO) "... with environment variable in NAND FLASH" ; \
2785 2618 elif [ "$(findstring dataflash_cs0,$@)" ] ; then \
2786 2619 echo "#define CONFIG_SYS_USE_DATAFLASH_CS3 1" >>$(obj)include/config.h ; \
2787   - $(XECHO) "... with environment variable in SPI DATAFLASH CS3" ; \
2788 2620 else \
2789 2621 echo "#define CONFIG_SYS_USE_DATAFLASH_CS0 1" >>$(obj)include/config.h ; \
2790   - $(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \
2791 2622 fi;
2792   - @$(MKCONFIG) -a at91sam9261ek arm arm926ejs at91sam9261ek atmel at91
  2623 + @$(MKCONFIG) -n $@ -a at91sam9261ek arm arm926ejs at91sam9261ek atmel at91
2793 2624  
2794 2625 at91sam9263ek_norflash_config \
2795 2626 at91sam9263ek_norflash_boot_config \
2796 2627  
2797 2628  
2798 2629  
2799 2630  
... ... @@ -2800,19 +2631,15 @@
2800 2631 @mkdir -p $(obj)include
2801 2632 @if [ "$(findstring _nandflash,$@)" ] ; then \
2802 2633 echo "#define CONFIG_SYS_USE_NANDFLASH 1" >>$(obj)include/config.h ; \
2803   - $(XECHO) "... with environment variable in NAND FLASH" ; \
2804 2634 elif [ "$(findstring norflash,$@)" ] ; then \
2805 2635 echo "#define CONFIG_SYS_USE_NORFLASH 1" >>$(obj)include/config.h ; \
2806   - $(XECHO) "... with environment variable in NOR FLASH" ; \
2807 2636 else \
2808 2637 echo "#define CONFIG_SYS_USE_DATAFLASH 1" >>$(obj)include/config.h ; \
2809   - $(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \
2810 2638 fi;
2811 2639 @if [ "$(findstring norflash_boot,$@)" ] ; then \
2812 2640 echo "#define CONFIG_SYS_USE_BOOT_NORFLASH 1" >>$(obj)include/config.h ; \
2813   - $(XECHO) "... and boot from NOR FLASH" ; \
2814 2641 fi;
2815   - @$(MKCONFIG) -a at91sam9263ek arm arm926ejs at91sam9263ek atmel at91
  2642 + @$(MKCONFIG) -n $@ -a at91sam9263ek arm arm926ejs at91sam9263ek atmel at91
2816 2643  
2817 2644 at91sam9rlek_nandflash_config \
2818 2645 at91sam9rlek_dataflash_config \
2819 2646  
2820 2647  
... ... @@ -2821,12 +2648,10 @@
2821 2648 @mkdir -p $(obj)include
2822 2649 @if [ "$(findstring _nandflash,$@)" ] ; then \
2823 2650 echo "#define CONFIG_SYS_USE_NANDFLASH 1" >>$(obj)include/config.h ; \
2824   - $(XECHO) "... with environment variable in NAND FLASH" ; \
2825 2651 else \
2826 2652 echo "#define CONFIG_SYS_USE_DATAFLASH 1" >>$(obj)include/config.h ; \
2827   - $(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \
2828 2653 fi;
2829   - @$(MKCONFIG) -a at91sam9rlek arm arm926ejs at91sam9rlek atmel at91
  2654 + @$(MKCONFIG) -n $@ -a at91sam9rlek arm arm926ejs at91sam9rlek atmel at91
2830 2655  
2831 2656 CPU9G20_128M_config \
2832 2657 CPU9G20_config \
... ... @@ -2834,7 +2659,7 @@
2834 2659 CPU9260_config : unconfig
2835 2660 @mkdir -p $(obj)include
2836 2661 @echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
2837   - @$(MKCONFIG) -a cpu9260 arm arm926ejs cpu9260 eukrea at91
  2662 + @$(MKCONFIG) -n $@ -a cpu9260 arm arm926ejs cpu9260 eukrea at91
2838 2663  
2839 2664 meesc_config : unconfig
2840 2665 @$(MKCONFIG) $(@:_config=) arm arm926ejs meesc esd at91
2841 2666  
2842 2667  
2843 2668  
2844 2669  
... ... @@ -2853,19 +2678,15 @@
2853 2678 @mkdir -p $(obj)include
2854 2679 @if [ "$(findstring 9m10,$@)" ] ; then \
2855 2680 echo "#define CONFIG_AT91SAM9M10G45EK 1" >>$(obj)include/config.h ; \
2856   - $(XECHO) "... 9M10G45 Variant" ; \
2857 2681 else \
2858 2682 echo "#define CONFIG_AT91SAM9G45EKES 1" >>$(obj)include/config.h ; \
2859 2683 fi;
2860   -
2861 2684 @if [ "$(findstring _nandflash,$@)" ] ; then \
2862 2685 echo "#define CONFIG_SYS_USE_NANDFLASH 1" >>$(obj)include/config.h ; \
2863   - $(XECHO) "... with environment variable in NAND FLASH" ; \
2864 2686 else \
2865 2687 echo "#define CONFIG_ATMEL_SPI 1" >>$(obj)include/config.h ; \
2866   - $(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \
2867 2688 fi;
2868   - @$(MKCONFIG) -a at91sam9m10g45ek arm arm926ejs at91sam9m10g45ek atmel at91
  2689 + @$(MKCONFIG) -n $@ -a at91sam9m10g45ek arm arm926ejs at91sam9m10g45ek atmel at91
2869 2690  
2870 2691 otc570_config : unconfig
2871 2692 @$(MKCONFIG) $(@:_config=) arm arm926ejs otc570 esd at91
... ... @@ -2878,7 +2699,7 @@
2878 2699 SBC35_A9G20_config : unconfig
2879 2700 @mkdir -p $(obj)include
2880 2701 @echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
2881   - @$(MKCONFIG) -a sbc35_a9g20 arm arm926ejs sbc35_a9g20 calao at91
  2702 + @$(MKCONFIG) -n $@ -a sbc35_a9g20 arm arm926ejs sbc35_a9g20 calao at91
2882 2703  
2883 2704 TNY_A9G20_NANDFLASH_config \
2884 2705 TNY_A9G20_EEPROM_config \
... ... @@ -2888,7 +2709,7 @@
2888 2709 TNY_A9260_config : unconfig
2889 2710 @mkdir -p $(obj)include
2890 2711 @echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
2891   - @$(MKCONFIG) -a tny_a9260 arm arm926ejs tny_a9260 calao at91
  2712 + @$(MKCONFIG) -n $@ -a tny_a9260 arm arm926ejs tny_a9260 calao at91
2892 2713  
2893 2714 ########################################################################
2894 2715 ## ARM Integrator boards - see doc/README-integrator for more info.
2895 2716  
... ... @@ -2916,33 +2737,18 @@
2916 2737 cp1026_config: unconfig
2917 2738 @board/armltd/integrator/split_by_variant.sh cp $@
2918 2739  
2919   -da830evm_config: unconfig
2920   - @$(MKCONFIG) $(@:_config=) arm arm926ejs da830evm davinci davinci
  2740 +da830evm_config \
  2741 +davinci_dvevm_config \
  2742 +davinci_schmoogie_config \
  2743 +davinci_sffsdr_config \
  2744 +davinci_sonata_config \
  2745 +davinci_dm355evm_config \
  2746 +davinci_dm355leopard_config \
  2747 +davinci_dm365evm_config \
  2748 +davinci_dm6467evm_config : unconfig
  2749 + @$(MKCONFIG) -n $@ $(@:_config=) arm arm926ejs \
  2750 + $(subst davinci_,,$(@:_config=)) davinci davinci
2921 2751  
2922   -davinci_dvevm_config : unconfig
2923   - @$(MKCONFIG) $(@:_config=) arm arm926ejs dvevm davinci davinci
2924   -
2925   -davinci_schmoogie_config : unconfig
2926   - @$(MKCONFIG) $(@:_config=) arm arm926ejs schmoogie davinci davinci
2927   -
2928   -davinci_sffsdr_config : unconfig
2929   - @$(MKCONFIG) $(@:_config=) arm arm926ejs sffsdr davinci davinci
2930   -
2931   -davinci_sonata_config : unconfig
2932   - @$(MKCONFIG) $(@:_config=) arm arm926ejs sonata davinci davinci
2933   -
2934   -davinci_dm355evm_config : unconfig
2935   - @$(MKCONFIG) $(@:_config=) arm arm926ejs dm355evm davinci davinci
2936   -
2937   -davinci_dm355leopard_config : unconfig
2938   - @$(MKCONFIG) $(@:_config=) arm arm926ejs dm355leopard davinci davinci
2939   -
2940   -davinci_dm365evm_config : unconfig
2941   - @$(MKCONFIG) $(@:_config=) arm arm926ejs dm365evm davinci davinci
2942   -
2943   -davinci_dm6467evm_config : unconfig
2944   - @$(MKCONFIG) $(@:_config=) arm arm926ejs dm6467evm davinci davinci
2945   -
2946 2752 guruplug_config: unconfig
2947 2753 @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood
2948 2754  
... ... @@ -2952,7 +2758,7 @@
2952 2758  
2953 2759 lpd7a400_config \
2954 2760 lpd7a404_config: unconfig
2955   - @$(MKCONFIG) $(@:_config=) arm lh7a40x lpd7a40x
  2761 + @$(MKCONFIG) -n $(@:_config=) arm lh7a40x lpd7a40x
2956 2762  
2957 2763 mv88f6281gtw_ge_config: unconfig
2958 2764 @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood
2959 2765  
... ... @@ -2972,11 +2778,8 @@
2972 2778 @ > $(obj)include/config.h
2973 2779 @if [ "$(findstring _onenand, $@)" ] ; then \
2974 2780 echo "#define CONFIG_BOOT_ONENAND" >> $(obj)include/config.h; \
2975   - $(XECHO) "... configured to boot from OneNand Flash"; \
2976   - else \
2977   - $(XECHO) "... configured to boot from Nand Flash"; \
2978 2781 fi
2979   - @$(MKCONFIG) -a nhk8815 arm arm926ejs nhk8815 st nomadik
  2782 + @$(MKCONFIG) -n $@ -a nhk8815 arm arm926ejs nhk8815 st nomadik
2980 2783  
2981 2784 omap1510inn_config : unconfig
2982 2785 @$(MKCONFIG) $(@:_config=) arm arm925t omap1510inn ti
2983 2786  
2984 2787  
2985 2788  
... ... @@ -2994,15 +2797,12 @@
2994 2797 @mkdir -p $(obj)include
2995 2798 @if [ "$(findstring _cs0boot_, $@)" ] ; then \
2996 2799 echo "#define CONFIG_CS0_BOOT" >> .$(obj)include/config.h ; \
2997   - $(XECHO) "... configured for CS0 boot"; \
2998 2800 elif [ "$(findstring _cs_autoboot_, $@)" ] ; then \
2999 2801 echo "#define CONFIG_CS_AUTOBOOT" >> $(obj)include/config.h ; \
3000   - $(XECHO) "... configured for CS_AUTO boot"; \
3001 2802 else \
3002 2803 echo "#define CONFIG_CS3_BOOT" >> $(obj)include/config.h ; \
3003   - $(XECHO) "... configured for CS3 boot"; \
3004 2804 fi;
3005   - @$(MKCONFIG) -a $(call xtract_omap1610xxx,$@) arm arm926ejs omap1610inn ti omap
  2805 + @$(MKCONFIG) -n $@ -a $(call xtract_omap1610xxx,$@) arm arm926ejs omap1610inn ti omap
3006 2806  
3007 2807 omap5912osk_config : unconfig
3008 2808 @$(MKCONFIG) $(@:_config=) arm arm926ejs omap5912osk ti omap
3009 2809  
3010 2810  
... ... @@ -3018,12 +2818,10 @@
3018 2818 @mkdir -p $(obj)include
3019 2819 @if [ "$(findstring _cs0boot_, $@)" ] ; then \
3020 2820 echo "#define CONFIG_CS0_BOOT" >> $(obj)include/config.h ; \
3021   - $(XECHO) "... configured for CS0 boot"; \
3022 2821 else \
3023 2822 echo "#define CONFIG_CS3_BOOT" >> $(obj)include/config.h ; \
3024   - $(XECHO) "... configured for CS3 boot"; \
3025 2823 fi;
3026   - @$(MKCONFIG) -a $(call xtract_omap730p2,$@) arm arm926ejs omap730p2 ti omap
  2824 + @$(MKCONFIG) -n $@ -a $(call xtract_omap730p2,$@) arm arm926ejs omap730p2 ti omap
3027 2825  
3028 2826 rd6281a_config: unconfig
3029 2827 @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood
3030 2828  
3031 2829  
... ... @@ -3059,12 +2857,10 @@
3059 2857 @mkdir -p $(obj)include
3060 2858 @if [ "$(findstring _stdout_serial_, $@)" ] ; then \
3061 2859 echo "#undef CONFIG_STDOUT_USBTTY" >> $(obj)include/config.h ; \
3062   - $(XECHO) "... configured for stdout serial"; \
3063 2860 else \
3064 2861 echo "#define CONFIG_STDOUT_USBTTY" >> $(obj)include/config.h ; \
3065   - $(XECHO) "... configured for stdout usbtty"; \
3066 2862 fi;
3067   - @$(MKCONFIG) SX1 arm arm925t sx1
  2863 + @$(MKCONFIG) -n $@ SX1 arm arm925t sx1
3068 2864  
3069 2865 # TRAB default configuration: 8 MB Flash, 32 MB RAM
3070 2866 xtract_trab = $(subst _bigram,,$(subst _bigflash,,$(subst _old,,$(subst _config,,$1))))
3071 2867  
3072 2868  
3073 2869  
3074 2870  
3075 2871  
... ... @@ -3078,25 +2874,22 @@
3078 2874 @[ -z "$(findstring _bigram,$@)" ] || \
3079 2875 { echo "#define CONFIG_FLASH_8MB" >>$(obj)include/config.h ; \
3080 2876 echo "#define CONFIG_RAM_32MB" >>$(obj)include/config.h ; \
3081   - $(XECHO) "... with 8 MB Flash, 32 MB RAM" ; \
3082 2877 }
3083 2878 @[ -z "$(findstring _bigflash,$@)" ] || \
3084 2879 { echo "#define CONFIG_FLASH_16MB" >>$(obj)include/config.h ; \
3085 2880 echo "#define CONFIG_RAM_16MB" >>$(obj)include/config.h ; \
3086   - $(XECHO) "... with 16 MB Flash, 16 MB RAM" ; \
3087 2881 echo "TEXT_BASE = 0x0CF40000" >$(obj)board/trab/config.tmp ; \
3088 2882 }
3089 2883 @[ -z "$(findstring _old,$@)" ] || \
3090 2884 { echo "#define CONFIG_FLASH_8MB" >>$(obj)include/config.h ; \
3091 2885 echo "#define CONFIG_RAM_16MB" >>$(obj)include/config.h ; \
3092   - $(XECHO) "... with 8 MB Flash, 16 MB RAM" ; \
3093 2886 echo "TEXT_BASE = 0x0CF40000" >$(obj)board/trab/config.tmp ; \
3094 2887 }
3095   - @$(MKCONFIG) -a $(call xtract_trab,$@) arm arm920t trab NULL s3c24x0
  2888 + @$(MKCONFIG) -n $@ -a $(call xtract_trab,$@) arm arm920t trab NULL s3c24x0
3096 2889  
3097 2890 tx25_config : unconfig
3098   - @$(MKCONFIG) $(@:_config=) arm arm926ejs tx25 karo mx25
3099 2891 @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
  2892 + @$(MKCONFIG) $(@:_config=) arm arm926ejs tx25 karo mx25
3100 2893  
3101 2894 VCMA9_config : unconfig
3102 2895 @$(MKCONFIG) $(@:_config=) arm arm920t vcma9 mpl s3c24x0
3103 2896  
... ... @@ -3233,9 +3026,8 @@
3233 3026 @mkdir -p $(obj)include
3234 3027 @if [ "$(findstring scpu_,$@)" ] ; then \
3235 3028 echo "#define CONFIG_SCPU" >>$(obj)include/config.h ; \
3236   - $(XECHO) "... on SCPU board variant" ; \
3237 3029 fi
3238   - @$(MKCONFIG) -a pdnb3 arm ixp pdnb3 prodrive
  3030 + @$(MKCONFIG) -n $@ -a pdnb3 arm ixp pdnb3 prodrive
3239 3031  
3240 3032 pxa255_idp_config: unconfig
3241 3033 @$(MKCONFIG) $(@:_config=) arm pxa pxa255_idp
... ... @@ -3246,7 +3038,7 @@
3246 3038 @if [ "$(findstring polaris,$@)" ] ; then \
3247 3039 echo "#define CONFIG_POLARIS 1" >>$(obj)include/config.h ; \
3248 3040 fi;
3249   - @$(MKCONFIG) -a trizepsiv arm pxa trizepsiv
  3041 + @$(MKCONFIG) -n $@ -a trizepsiv arm pxa trizepsiv
3250 3042  
3251 3043 wepep250_config : unconfig
3252 3044 @$(MKCONFIG) $(@:_config=) arm pxa wepep250
3253 3045  
... ... @@ -3270,8 +3062,8 @@
3270 3062 apollon_config : unconfig
3271 3063 @mkdir -p $(obj)include
3272 3064 @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h
3273   - @$(MKCONFIG) $(@:_config=) arm arm1136 apollon NULL omap24xx
3274 3065 @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
  3066 + @$(MKCONFIG) $(@:_config=) arm arm1136 apollon NULL omap24xx
3275 3067  
3276 3068 imx31_litekit_config : unconfig
3277 3069 @$(MKCONFIG) $(@:_config=) arm arm1136 imx31_litekit logicpd mx31
... ... @@ -3282,7 +3074,7 @@
3282 3074 @if [ -n "$(findstring _eet_,$@)" ]; then \
3283 3075 echo "#define CONFIG_IMX31_PHYCORE_EET" >> $(obj)include/config.h; \
3284 3076 fi
3285   - @$(MKCONFIG) -a imx31_phycore arm arm1136 imx31_phycore NULL mx31
  3077 + @$(MKCONFIG) -n $@ -a imx31_phycore arm arm1136 imx31_phycore NULL mx31
3286 3078  
3287 3079 mx31ads_config : unconfig
3288 3080 @$(MKCONFIG) $(@:_config=) arm arm1136 mx31ads freescale mx31
... ... @@ -3296,7 +3088,7 @@
3296 3088 echo "#define CONFIG_SKIP_LOWLEVEL_INIT" >> $(obj)include/config.h; \
3297 3089 echo "#define CONFIG_SKIP_RELOCATE_UBOOT" >> $(obj)include/config.h; \
3298 3090 fi
3299   - @$(MKCONFIG) -a mx31pdk arm arm1136 mx31pdk freescale mx31
  3091 + @$(MKCONFIG) -n $@ -a mx31pdk arm arm1136 mx31pdk freescale mx31
3300 3092  
3301 3093 mx51evk_config : unconfig
3302 3094 @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 mx51evk freescale mx51
3303 3095  
3304 3096  
3305 3097  
... ... @@ -3315,14 +3107,13 @@
3315 3107 @mkdir -p $(obj)include $(obj)board/samsung/smdk6400
3316 3108 @mkdir -p $(obj)nand_spl/board/samsung/smdk6400
3317 3109 @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
  3110 + @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
3318 3111 @if [ -z "$(findstring smdk6400_noUSB_config,$@)" ]; then \
3319 3112 echo "RAM_TEXT = 0x57e00000" >> $(obj)board/samsung/smdk6400/config.tmp;\
3320   - $(MKCONFIG) $(@:_config=) arm arm1176 smdk6400 samsung s3c64xx; \
3321 3113 else \
3322 3114 echo "RAM_TEXT = 0xc7e00000" >> $(obj)board/samsung/smdk6400/config.tmp;\
3323   - $(MKCONFIG) $(@:_noUSB_config=) arm arm1176 smdk6400 samsung s3c64xx; \
3324 3115 fi
3325   - @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
  3116 + @$(MKCONFIG) $(subst _noUSB,,$(@:_config=)) arm arm1176 smdk6400 samsung s3c64xx
3326 3117  
3327 3118 #========================================================================
3328 3119 # i386
3329 3120  
3330 3121  
3331 3122  
... ... @@ -3349,26 +3140,18 @@
3349 3140 ## MIPS32 4Kc
3350 3141 #########################################################################
3351 3142  
3352   -xtract_incaip = $(subst _100MHz,,$(subst _133MHz,,$(subst _150MHz,,$(subst _config,,$1))))
3353   -
3354 3143 incaip_100MHz_config \
3355 3144 incaip_133MHz_config \
3356 3145 incaip_150MHz_config \
3357 3146 incaip_config: unconfig
3358 3147 @mkdir -p $(obj)include
3359 3148 @[ -z "$(findstring _100MHz,$@)" ] || \
3360   - { echo "#define CPU_CLOCK_RATE 100000000" >>$(obj)include/config.h ; \
3361   - $(XECHO) "... with 100MHz system clock" ; \
3362   - }
  3149 + echo "#define CPU_CLOCK_RATE 100000000" >>$(obj)include/config.h
3363 3150 @[ -z "$(findstring _133MHz,$@)" ] || \
3364   - { echo "#define CPU_CLOCK_RATE 133000000" >>$(obj)include/config.h ; \
3365   - $(XECHO) "... with 133MHz system clock" ; \
3366   - }
  3151 + echo "#define CPU_CLOCK_RATE 133000000" >>$(obj)include/config.h
3367 3152 @[ -z "$(findstring _150MHz,$@)" ] || \
3368   - { echo "#define CPU_CLOCK_RATE 150000000" >>$(obj)include/config.h ; \
3369   - $(XECHO) "... with 150MHz system clock" ; \
3370   - }
3371   - @$(MKCONFIG) -a $(call xtract_incaip,$@) mips mips incaip
  3153 + echo "#define CPU_CLOCK_RATE 150000000" >>$(obj)include/config.h
  3154 + @$(MKCONFIG) -n $@ -a incaip mips mips incaip
3372 3155  
3373 3156 tb0229_config: unconfig
3374 3157 @$(MKCONFIG) $(@:_config=) mips mips tb0229
... ... @@ -3386,27 +3169,17 @@
3386 3169 vct_platinumavc_onenand_config \
3387 3170 vct_platinumavc_onenand_small_config: unconfig
3388 3171 @mkdir -p $(obj)include
3389   - @if [ "$(findstring _premium,$@)" ] ; then \
3390   - echo "#define CONFIG_VCT_PREMIUM" > $(obj)include/config.h ; \
3391   - $(XECHO) "... on Premium board variant" ; \
3392   - fi
3393   - @if [ "$(findstring _platinum_,$@)" ] ; then \
3394   - echo "#define CONFIG_VCT_PLATINUM" > $(obj)include/config.h ; \
3395   - $(XECHO) "... on Platinum board variant" ; \
3396   - fi
3397   - @if [ "$(findstring _platinumavc,$@)" ] ; then \
3398   - echo "#define CONFIG_VCT_PLATINUMAVC" > $(obj)include/config.h ; \
3399   - $(XECHO) "... on PlatinumAVC board variant" ; \
3400   - fi
3401   - @if [ "$(findstring _onenand,$@)" ] ; then \
3402   - echo "#define CONFIG_VCT_ONENAND" >> $(obj)include/config.h ; \
3403   - $(XECHO) "... on OneNAND board variant" ; \
3404   - fi
3405   - @if [ "$(findstring _small,$@)" ] ; then \
3406   - echo "#define CONFIG_VCT_SMALL_IMAGE" >> $(obj)include/config.h ; \
3407   - $(XECHO) "... stripped down image variant" ; \
3408   - fi
3409   - @$(MKCONFIG) -a vct mips mips vct micronas
  3172 + @[ -z "$(findstring _premium,$@)" ] || \
  3173 + echo "#define CONFIG_VCT_PREMIUM" > $(obj)include/config.h
  3174 + @[ -z "$(findstring _platinum_,$@)" ] || \
  3175 + echo "#define CONFIG_VCT_PLATINUM" > $(obj)include/config.h
  3176 + @[ -z "$(findstring _platinumavc,$@)" ] || \
  3177 + echo "#define CONFIG_VCT_PLATINUMAVC" > $(obj)include/config.h
  3178 + @[ -z "$(findstring _onenand,$@)" ] || \
  3179 + echo "#define CONFIG_VCT_ONENAND" >> $(obj)include/config.h
  3180 + @[ -z "$(findstring _small,$@)" ] || \
  3181 + echo "#define CONFIG_VCT_SMALL_IMAGE" >> $(obj)include/config.h
  3182 + @$(MKCONFIG) -n $@ -a vct mips mips vct micronas
3410 3183  
3411 3184 #########################################################################
3412 3185 ## MIPS32 AU1X00
... ... @@ -3528,15 +3301,9 @@
3528 3301 atngw100_config : unconfig
3529 3302 @$(MKCONFIG) $(@:_config=) avr32 at32ap atngw100 atmel at32ap700x
3530 3303  
3531   -atstk1002_config : unconfig
3532   - @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
3533   -
3534   -atstk1003_config : unconfig
3535   - @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
3536   -
3537   -atstk1004_config : unconfig
3538   - @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
3539   -
  3304 +atstk1002_config \
  3305 +atstk1003_config \
  3306 +atstk1004_config \
3540 3307 atstk1006_config : unconfig
3541 3308 @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
3542 3309  
3543 3310  
... ... @@ -3619,9 +3386,8 @@
3619 3386 echo "#define CONFIG_SH_32BIT 1" >> $(obj)include/config.h ; \
3620 3387 echo "TEXT_BASE = 0x8ff80000" > \
3621 3388 $(obj)board/renesas/sh7785lcr/config.tmp ; \
3622   - $(XECHO) " ... enable 32-Bit Address Extended Mode" ; \
3623 3389 fi
3624   - @$(MKCONFIG) -a $(call xtract_sh7785lcr,$@) sh sh4 sh7785lcr renesas
  3390 + @$(MKCONFIG) -n $@ -a $(call xtract_sh7785lcr,$@) sh sh4 sh7785lcr renesas
3625 3391  
3626 3392 ap325rxa_config : unconfig
3627 3393 @mkdir -p $(obj)include