diff options
| author | Masahiro Yamada <[email protected]> | 2014-06-24 22:10:52 +0900 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2014-07-07 19:42:34 -0400 |
| commit | a8b0f9b685072e1d3acd01741e7db6833b445b2a (patch) | |
| tree | ef92f75a73693017a4bc42e690eec2b0618d48cc | |
| parent | d1db76f1494492fc1c13e3bfe036c6dfb942e8be (diff) | |
build: define CPU only when arch/${ARCH}/cpu/${CPU} exists
The directory arch/${ARCH}/cpu/${CPU} does not exist
in avr32, blackfin, microblaze, nios2, openrisc, sandbox, x86.
These architectures have only one CPU type.
Defining CPU should not be required for such architectures.
This commit allows cpu field (= the 3rd field of boards.cfg)
to be kept blank.
Signed-off-by: Masahiro Yamada <[email protected]>
Cc: Andreas Bießmann <[email protected]>
Cc: Simon Glass <[email protected]>
Cc: Sonic Zhang <[email protected]>
Cc: Michal Simek <[email protected]>
Cc: Thomas Chou <[email protected]>
Cc: Stefan Kristiansson <[email protected]>
| -rw-r--r-- | arch/sandbox/include/asm/sound.h (renamed from arch/sandbox/include/asm/arch-sandbox/sound.h) | 0 | ||||
| -rw-r--r-- | boards.cfg | 104 | ||||
| -rw-r--r-- | config.mk | 5 | ||||
| -rw-r--r-- | drivers/sound/sandbox.c | 2 | ||||
| -rwxr-xr-x | mkconfig | 11 |
5 files changed, 62 insertions, 60 deletions
diff --git a/arch/sandbox/include/asm/arch-sandbox/sound.h b/arch/sandbox/include/asm/sound.h index a32e8c802d7..a32e8c802d7 100644 --- a/arch/sandbox/include/asm/arch-sandbox/sound.h +++ b/arch/sandbox/include/asm/sound.h diff --git a/boards.cfg b/boards.cfg index 6f8d168cf15..3fbf714b327 100644 --- a/boards.cfg +++ b/boards.cfg @@ -419,36 +419,36 @@ Active arm pxa - - vpac270 Active arm pxa - icpdas lp8x4x lp8x4x - Sergey Yanovich <[email protected]> Active arm pxa - toradex - colibri_pxa270 - Marek Vasut <[email protected]> Active arm sa1100 - - - jornada - Kristoffer Ericson <[email protected]> -Active avr32 at32ap at32ap700x atmel - atngw100mkii - Andreas Bießmann <[email protected]> -Active avr32 at32ap at32ap700x in-circuit - grasshopper - Andreas Bießmann <[email protected]> -Active avr32 at32ap at32ap700x mimc - mimc200 - Mark Jackson <[email protected]> -Active avr32 at32ap at32ap700x miromico - hammerhead - Alex Raimondi <[email protected]> -Active blackfin blackfin - - - bct-brettl2 - Peter Meerwald <[email protected]> -Active blackfin blackfin - - - bf506f-ezkit - Sonic Zhang <[email protected]> -Active blackfin blackfin - - - bf518f-ezbrd - Sonic Zhang <[email protected]> -Active blackfin blackfin - - - bf525-ucr2 - Haitao Zhang <[email protected]>:Chong Huang <[email protected]> -Active blackfin blackfin - - - bf526-ezbrd - Sonic Zhang <[email protected]> -Active blackfin blackfin - - - bf527-ad7160-eval - Sonic Zhang <[email protected]> -Active blackfin blackfin - - - bf527-ezkit - Sonic Zhang <[email protected]> -Active blackfin blackfin - - - bf527-sdp - Sonic Zhang <[email protected]> -Active blackfin blackfin - - - bf533-ezkit - Sonic Zhang <[email protected]> -Active blackfin blackfin - - - bf533-stamp - Sonic Zhang <[email protected]> -Active blackfin blackfin - - - bf537-minotaur - Martin Strubel <[email protected]> -Active blackfin blackfin - - - bf537-pnav - Sonic Zhang <[email protected]> -Active blackfin blackfin - - - bf537-srv1 - Martin Strubel <[email protected]> -Active blackfin blackfin - - - bf537-stamp - Sonic Zhang <[email protected]> -Active blackfin blackfin - - - bf538f-ezkit - Sonic Zhang <[email protected]> -Active blackfin blackfin - - - bf548-ezkit - Sonic Zhang <[email protected]> -Active blackfin blackfin - - - bf561-acvilon - Valentin Yakovenkov <[email protected]> -Active blackfin blackfin - - - bf561-ezkit - Sonic Zhang <[email protected]> -Active blackfin blackfin - - - bf609-ezkit - Sonic Zhang <[email protected]> -Active blackfin blackfin - - - blackstamp - Wojtek Skulski <[email protected]>:Wojtek Skulski <[email protected]>:Benjamin Matthews <[email protected]> -Active blackfin blackfin - - - blackvme - Wojtek Skulski <[email protected]>:Wojtek Skulski <[email protected]>:Benjamin Matthews <[email protected]> -Active blackfin blackfin - - - br4 - Dimitar Penev <[email protected]> -Active blackfin blackfin - - - dnp5370 - M.Hasewinkel (MHA) <[email protected]> -Active blackfin blackfin - - - ibf-dsp561 - I-SYST Micromodule <[email protected]> -Active blackfin blackfin - - - pr1 - Dimitar Penev <[email protected]> -Active blackfin blackfin - - bf527-ezkit bf527-ezkit-v2 bf527-ezkit:BF527_EZKIT_REV_2_1 Sonic Zhang <[email protected]> +Active avr32 - at32ap700x atmel - atngw100mkii - Andreas Bießmann <[email protected]> +Active avr32 - at32ap700x in-circuit - grasshopper - Andreas Bießmann <[email protected]> +Active avr32 - at32ap700x mimc - mimc200 - Mark Jackson <[email protected]> +Active avr32 - at32ap700x miromico - hammerhead - Alex Raimondi <[email protected]> +Active blackfin - - - - bct-brettl2 - Peter Meerwald <[email protected]> +Active blackfin - - - - bf506f-ezkit - Sonic Zhang <[email protected]> +Active blackfin - - - - bf518f-ezbrd - Sonic Zhang <[email protected]> +Active blackfin - - - - bf525-ucr2 - Haitao Zhang <[email protected]>:Chong Huang <[email protected]> +Active blackfin - - - - bf526-ezbrd - Sonic Zhang <[email protected]> +Active blackfin - - - - bf527-ad7160-eval - Sonic Zhang <[email protected]> +Active blackfin - - - - bf527-ezkit - Sonic Zhang <[email protected]> +Active blackfin - - - - bf527-sdp - Sonic Zhang <[email protected]> +Active blackfin - - - - bf533-ezkit - Sonic Zhang <[email protected]> +Active blackfin - - - - bf533-stamp - Sonic Zhang <[email protected]> +Active blackfin - - - - bf537-minotaur - Martin Strubel <[email protected]> +Active blackfin - - - - bf537-pnav - Sonic Zhang <[email protected]> +Active blackfin - - - - bf537-srv1 - Martin Strubel <[email protected]> +Active blackfin - - - - bf537-stamp - Sonic Zhang <[email protected]> +Active blackfin - - - - bf538f-ezkit - Sonic Zhang <[email protected]> +Active blackfin - - - - bf548-ezkit - Sonic Zhang <[email protected]> +Active blackfin - - - - bf561-acvilon - Valentin Yakovenkov <[email protected]> +Active blackfin - - - - bf561-ezkit - Sonic Zhang <[email protected]> +Active blackfin - - - - bf609-ezkit - Sonic Zhang <[email protected]> +Active blackfin - - - - blackstamp - Wojtek Skulski <[email protected]>:Wojtek Skulski <[email protected]>:Benjamin Matthews <[email protected]> +Active blackfin - - - - blackvme - Wojtek Skulski <[email protected]>:Wojtek Skulski <[email protected]>:Benjamin Matthews <[email protected]> +Active blackfin - - - - br4 - Dimitar Penev <[email protected]> +Active blackfin - - - - dnp5370 - M.Hasewinkel (MHA) <[email protected]> +Active blackfin - - - - ibf-dsp561 - I-SYST Micromodule <[email protected]> +Active blackfin - - - - pr1 - Dimitar Penev <[email protected]> +Active blackfin - - - bf527-ezkit bf527-ezkit-v2 bf527-ezkit:BF527_EZKIT_REV_2_1 Sonic Zhang <[email protected]> Active m68k mcf5227x - freescale m52277evb M52277EVB M52277EVB:SYS_SPANSION_BOOT,SYS_TEXT_BASE=0x00000000 TsiChung Liew <[email protected]> Active m68k mcf5227x - freescale m52277evb M52277EVB_stmicro M52277EVB:CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x43E00000 TsiChung Liew <[email protected]> Active m68k mcf523x - freescale m5235evb M5235EVB M5235EVB:SYS_TEXT_BASE=0xFFE00000 TsiChung Liew <[email protected]> @@ -496,7 +496,7 @@ Active m68k mcf547x_8x - freescale m548xevb Active m68k mcf547x_8x - freescale m548xevb M5485FFE M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64 TsiChung Liew <[email protected]> Active m68k mcf547x_8x - freescale m548xevb M5485GFE M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64 TsiChung Liew <[email protected]> Active m68k mcf547x_8x - freescale m548xevb M5485HFE M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO TsiChung Liew <[email protected]> -Active microblaze microblaze - xilinx microblaze-generic microblaze-generic - Michal Simek <[email protected]> +Active microblaze - - xilinx microblaze-generic microblaze-generic - Michal Simek <[email protected]> Active mips mips32 - - qemu-mips qemu_mips qemu-mips:SYS_BIG_ENDIAN Vlad Lungu <[email protected]> Active mips mips32 - - qemu-mips qemu_mipsel qemu-mips:SYS_LITTLE_ENDIAN - Active mips mips32 - imgtec malta malta malta:SYS_BIG_ENDIAN Paul Burton <[email protected]> @@ -524,10 +524,10 @@ Active mips mips64 - - qemu-mips Active nds32 n1213 ag101 AndesTech adp-ag101 adp-ag101 - Andes <[email protected]> Active nds32 n1213 ag101 AndesTech adp-ag101p adp-ag101p - Andes <[email protected]> Active nds32 n1213 ag102 AndesTech adp-ag102 adp-ag102 - Andes <[email protected]> -Active nios2 nios2 - altera nios2-generic nios2-generic - Scott McNutt <[email protected]> -Active nios2 nios2 - psyent pci5441 PCI5441 - Scott McNutt <[email protected]> -Active nios2 nios2 - psyent pk1c20 PK1C20 - Scott McNutt <[email protected]> -Active openrisc or1200 - openrisc openrisc-generic openrisc-generic - Stefan Kristiansson <[email protected]> +Active nios2 - - altera nios2-generic nios2-generic - Scott McNutt <[email protected]> +Active nios2 - - psyent pci5441 PCI5441 - Scott McNutt <[email protected]> +Active nios2 - - psyent pk1c20 PK1C20 - Scott McNutt <[email protected]> +Active openrisc - - openrisc openrisc-generic openrisc-generic - Stefan Kristiansson <[email protected]> Active powerpc 74xx_7xx - - - ppmc7xx - - Active powerpc 74xx_7xx - - evb64260 P3G4 - Wolfgang Denk <[email protected]> Active powerpc 74xx_7xx - eltec elppc ELPPC - - @@ -1150,7 +1150,7 @@ Active powerpc ppc4xx - xilinx ppc405-generic Active powerpc ppc4xx - xilinx ppc405-generic xilinx-ppc405-generic_flash xilinx-ppc405-generic:SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC Ricardo Ribalda <[email protected]> Active powerpc ppc4xx - xilinx ppc440-generic xilinx-ppc440-generic xilinx-ppc440-generic:SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1 Ricardo Ribalda <[email protected]> Active powerpc ppc4xx - xilinx ppc440-generic xilinx-ppc440-generic_flash xilinx-ppc440-generic:SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC Ricardo Ribalda <[email protected]> -Active sandbox sandbox - - sandbox sandbox - Simon Glass <[email protected]> +Active sandbox - - - sandbox sandbox - Simon Glass <[email protected]> Active sh sh2 - renesas rsk7203 rsk7203 - Nobuhiro Iwamatsu <[email protected]>:Nobuhiro Iwamatsu <[email protected]> Active sh sh2 - renesas rsk7264 rsk7264 - Phil Edworthy <[email protected]> Active sh sh2 - renesas rsk7269 rsk7269 - - @@ -1178,7 +1178,7 @@ Active sparc leon3 - gaisler - Active sparc leon3 - gaisler - gr_ep2s60 - - Active sparc leon3 - gaisler - gr_xc3s_1500 - - Active sparc leon3 - gaisler - grsim - - -Active x86 x86 coreboot chromebook-x86 coreboot coreboot-x86 coreboot:SYS_TEXT_BASE=0x01110000 Simon Glass <[email protected]> +Active x86 - coreboot chromebook-x86 coreboot coreboot-x86 coreboot:SYS_TEXT_BASE=0x01110000 Simon Glass <[email protected]> # The following were moved to "Orphan" in June, 2014 Orphan arm arm1176 tnetv107x ti tnetv107xevm tnetv107x_evm - Chan-Taek Park <[email protected]> Orphan arm arm926ejs at91 calao sbc35_a9g20 sbc35_a9g20_eeprom sbc35_a9g20:AT91SAM9G20,SYS_USE_EEPROM Albin Tonnerre <[email protected]> @@ -1189,13 +1189,13 @@ Orphan arm arm926ejs at91 calao tny_a9260 Orphan arm arm926ejs at91 calao tny_a9260 tny_a9g20_nandflash tny_a9260:AT91SAM9G20,SYS_USE_NANDFLASH Albin Tonnerre <[email protected]> Orphan arm armv7 mx6 congatec cgtqmx6eval cgtqmx6qeval cgtqmx6eval:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q Leo Sartre <[email protected]> Orphan arm pxa - - - palmtreo680 - Mike Dunn <[email protected]> -Orphan avr32 at32ap at32ap700x atmel - atngw100 - Haavard Skinnemoen <[email protected]> -Orphan avr32 at32ap at32ap700x atmel atstk1000 atstk1002 - Haavard Skinnemoen <[email protected]> -Orphan avr32 at32ap at32ap700x atmel atstk1000 atstk1003 - Haavard Skinnemoen <[email protected]> -Orphan avr32 at32ap at32ap700x atmel atstk1000 atstk1004 - Haavard Skinnemoen <[email protected]> -Orphan avr32 at32ap at32ap700x atmel atstk1000 atstk1006 - Haavard Skinnemoen <[email protected]> -Orphan avr32 at32ap at32ap700x earthlcd - favr-32-ezkit - Hans-Christian Egtvedt <[email protected]> -Orphan blackfin blackfin - - - ip04 - Brent Kandetzki <[email protected]> +Orphan avr32 - at32ap700x atmel - atngw100 - Haavard Skinnemoen <[email protected]> +Orphan avr32 - at32ap700x atmel atstk1000 atstk1002 - Haavard Skinnemoen <[email protected]> +Orphan avr32 - at32ap700x atmel atstk1000 atstk1003 - Haavard Skinnemoen <[email protected]> +Orphan avr32 - at32ap700x atmel atstk1000 atstk1004 - Haavard Skinnemoen <[email protected]> +Orphan avr32 - at32ap700x atmel atstk1000 atstk1006 - Haavard Skinnemoen <[email protected]> +Orphan avr32 - at32ap700x earthlcd - favr-32-ezkit - Hans-Christian Egtvedt <[email protected]> +Orphan blackfin - - - - ip04 - Brent Kandetzki <[email protected]> Orphan m68k mcf52x2 - freescale m5253evbe M5253EVBE - Hayden Fraser <[email protected]> Orphan powerpc mpc5xxx - - galaxy5200 galaxy5200 galaxy5200:galaxy5200 Eric Millbrandt <[email protected]> Orphan powerpc mpc5xxx - - galaxy5200 galaxy5200_LOWBOOT galaxy5200:galaxy5200_LOWBOOT Eric Millbrandt <[email protected]> @@ -1226,14 +1226,14 @@ Orphan powerpc mpc824x - - musenki Orphan powerpc mpc824x - - sandpoint Sandpoint8245 - Jim Thompson <[email protected]> Orphan powerpc mpc8260 - - - ppmc8260 - Brad Kemp <[email protected]> # The following were moved to "Orphan" in March, 2014 -Orphan blackfin blackfin - - - cm-bf527 - Bluetechnix Tinyboards <[email protected]> -Orphan blackfin blackfin - - - cm-bf533 - Bluetechnix Tinyboards <[email protected]> -Orphan blackfin blackfin - - - cm-bf537e - Bluetechnix Tinyboards <[email protected]> -Orphan blackfin blackfin - - - cm-bf537u - Bluetechnix Tinyboards <[email protected]> -Orphan blackfin blackfin - - - cm-bf548 - Bluetechnix Tinyboards <[email protected]> -Orphan blackfin blackfin - - - cm-bf561 - Bluetechnix Tinyboards <[email protected]> -Orphan blackfin blackfin - - - tcm-bf518 - Bluetechnix Tinyboards <[email protected]> -Orphan blackfin blackfin - - - tcm-bf537 - Bluetechnix Tinyboards <[email protected]> +Orphan blackfin - - - - cm-bf527 - Bluetechnix Tinyboards <[email protected]> +Orphan blackfin - - - - cm-bf533 - Bluetechnix Tinyboards <[email protected]> +Orphan blackfin - - - - cm-bf537e - Bluetechnix Tinyboards <[email protected]> +Orphan blackfin - - - - cm-bf537u - Bluetechnix Tinyboards <[email protected]> +Orphan blackfin - - - - cm-bf548 - Bluetechnix Tinyboards <[email protected]> +Orphan blackfin - - - - cm-bf561 - Bluetechnix Tinyboards <[email protected]> +Orphan blackfin - - - - tcm-bf518 - Bluetechnix Tinyboards <[email protected]> +Orphan blackfin - - - - tcm-bf537 - Bluetechnix Tinyboards <[email protected]> Orphan powerpc mpc5xxx - matrix_vision mvbc_p MVBC_P MVBC_P:MVBC_P Andre Schwarz <[email protected]> Orphan powerpc mpc5xxx - matrix_vision mvsmr MVSMR - Andre Schwarz <[email protected]> Orphan powerpc mpc83xx - freescale mpc8360erdk MPC8360ERDK - Anton Vorontsov <[email protected]> diff --git a/config.mk b/config.mk index 05864aabb5a..bd74732d48d 100644 --- a/config.mk +++ b/config.mk @@ -24,10 +24,7 @@ OBJCOPYFLAGS := # so calculate CPUDIR before including ARCH/SOC/CPU config.mk files. # Check if arch/$ARCH/cpu/$CPU exists, otherwise assume arch/$ARCH/cpu contains # CPU-specific code. -CPUDIR=arch/$(ARCH)/cpu/$(CPU) -ifneq ($(srctree)/$(CPUDIR),$(wildcard $(srctree)/$(CPUDIR))) -CPUDIR=arch/$(ARCH)/cpu -endif +CPUDIR=arch/$(ARCH)/cpu$(if $(CPU),/$(CPU),) sinclude $(srctree)/arch/$(ARCH)/config.mk # include architecture dependend rules sinclude $(srctree)/$(CPUDIR)/config.mk # include CPU specific rules diff --git a/drivers/sound/sandbox.c b/drivers/sound/sandbox.c index fe5c9e9b38d..5599bb948fe 100644 --- a/drivers/sound/sandbox.c +++ b/drivers/sound/sandbox.c @@ -5,7 +5,7 @@ */ #include <common.h> -#include <asm/arch/sound.h> +#include <asm/sound.h> #include <asm/sdl.h> int sound_play(uint32_t msec, uint32_t frequency) @@ -55,6 +55,11 @@ CONFIG_NAME="${7%_config}" arch="$2" cpu=`echo $3 | awk 'BEGIN {FS = ":"} ; {print $1}'` spl_cpu=`echo $3 | awk 'BEGIN {FS = ":"} ; {print $2}'` + +if [ "$cpu" = "-" ] ; then + cpu= +fi + if [ "$6" = "<none>" ] ; then board= elif [ "$6" = "-" ] ; then @@ -114,10 +119,10 @@ fi rm -f asm/arch -if [ -z "${soc}" ] ; then - ln -s ${LNPREFIX}arch-${cpu} asm/arch -else +if [ "${soc}" ] ; then ln -s ${LNPREFIX}arch-${soc} asm/arch +elif [ "${cpu}" ] ; then + ln -s ${LNPREFIX}arch-${cpu} asm/arch fi if [ -z "$KBUILD_SRC" ] ; then |