Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e8897bfef2b056a527df21b25b602c59dbbad67a

Authored by Haavard Skinnemoen
1 parent 78693e47a2
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[AVR32] Kconfig: Choose daughterboard instead of CPU 

Remove the CPU selection menu and instead let it be selected by the
board or daughterboard option. Add daughterboard selection for
ATSTK1000 (this was previously determined based on CPU type.)

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>

Showing 2 changed files with 28 additions and 24 deletions Side-by-side Diff

... ... @@ -84,49 +84,34 @@
84 84 select MMU
85 85 select PERFORMANCE_COUNTERS
86 86  
  87 +#
  88 +# CPU types
  89 +#
  90 +
  91 +# AP7000 derivatives
87 92 config CPU_AT32AP700X
88 93 bool
89 94 select PLATFORM_AT32AP
90   -
91   -choice
92   - prompt "AVR32 CPU type"
93   - default CPU_AT32AP7000
94   -
95 95 config CPU_AT32AP7000
96   - bool "AT32AP7000"
  96 + bool
97 97 select CPU_AT32AP700X
98   -
99 98 config CPU_AT32AP7001
100   - bool "AT32AP7001"
  99 + bool
101 100 select CPU_AT32AP700X
102   -
103 101 config CPU_AT32AP7002
104   - bool "AT32AP7002"
  102 + bool
105 103 select CPU_AT32AP700X
106 104  
107   -endchoice
108   -
109   -#
110   -# CPU Daughterboards for ATSTK1000
111   -config BOARD_ATSTK1002
112   - bool
113   -config BOARD_ATSTK1003
114   - bool
115   -config BOARD_ATSTK1004
116   - bool
117   -
118 105 choice
119 106 prompt "AVR32 board type"
120 107 default BOARD_ATSTK1000
121 108  
122 109 config BOARD_ATSTK1000
123 110 bool "ATSTK1000 evaluation board"
124   - select BOARD_ATSTK1002 if CPU_AT32AP7000
125   - select BOARD_ATSTK1003 if CPU_AT32AP7001
126   - select BOARD_ATSTK1004 if CPU_AT32AP7002
127 111  
128 112 config BOARD_ATNGW100
129 113 bool "ATNGW100 Network Gateway"
  114 + select CPU_AT32AP7000
130 115 endchoice
131 116  
132 117 if BOARD_ATSTK1000
arch/avr32/boards/atstk1000/Kconfig
Diff comments   View file @ e8897bf
... ... @@ -2,6 +2,25 @@
2 2  
3 3 if BOARD_ATSTK1000
4 4  
  5 +choice
  6 + prompt "ATSTK1000 CPU daughterboard type"
  7 + default BOARD_ATSTK1002
  8 +
  9 +config BOARD_ATSTK1002
  10 + bool "ATSTK1002"
  11 + select CPU_AT32AP7000
  12 +
  13 +config BOARD_ATSTK1003
  14 + bool "ATSTK1003"
  15 + select CPU_AT32AP7001
  16 +
  17 +config BOARD_ATSTK1004
  18 + bool "ATSTK1004"
  19 + select CPU_AT32AP7002
  20 +
  21 +endchoice
  22 +
  23 +
5 24 config BOARD_ATSTK100X_CUSTOM
6 25 bool "Non-default STK1002/STK1003/STK1004 jumper settings"
7 26 help