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 yamada.m@jp.panasonic.com Cc: Andreas Bießmann andreas.devel@googlemail.com Cc: Simon Glass sjg@chromium.org Cc: Sonic Zhang sonic.zhang@analog.com Cc: Michal Simek michal.simek@xilinx.com Cc: Thomas Chou thomas@wytron.com.tw Cc: Stefan Kristiansson stefan.kristiansson@saunalahti.fi ---

I built all the boards and compared MD5SUM. I confirmed that the same binaries are generated with/without this patch.

.../sandbox/include/asm/{arch-sandbox => }/sound.h | 0 boards.cfg | 104 ++++++++++----------- config.mk | 5 +- drivers/sound/sandbox.c | 2 +- mkconfig | 11 ++- 5 files changed, 62 insertions(+), 60 deletions(-) rename arch/sandbox/include/asm/{arch-sandbox => }/sound.h (100%)

diff --git a/arch/sandbox/include/asm/arch-sandbox/sound.h b/arch/sandbox/include/asm/sound.h similarity index 100% rename from arch/sandbox/include/asm/arch-sandbox/sound.h rename to arch/sandbox/include/asm/sound.h diff --git a/boards.cfg b/boards.cfg index 947f2bc..539e368 100644 --- a/boards.cfg +++ b/boards.cfg @@ -417,36 +417,36 @@ Active arm pxa - - vpac270 Active arm pxa - icpdas lp8x4x lp8x4x - Sergey Yanovich ynvich@gmail.com Active arm pxa - toradex - colibri_pxa270 - Marek Vasut marek.vasut@gmail.com Active arm sa1100 - - - jornada - Kristoffer Ericson kristoffer.ericson@gmail.com -Active avr32 at32ap at32ap700x atmel - atngw100mkii - Andreas Bießmann andreas.devel@googlemail.com -Active avr32 at32ap at32ap700x in-circuit - grasshopper - Andreas Bießmann andreas.devel@googlemail.com -Active avr32 at32ap at32ap700x mimc - mimc200 - Mark Jackson mpfj@mimc.co.uk -Active avr32 at32ap at32ap700x miromico - hammerhead - Alex Raimondi alex.raimondi@miromico.ch -Active blackfin blackfin - - - bct-brettl2 - Peter Meerwald devel@bct-electronic.com -Active blackfin blackfin - - - bf506f-ezkit - Sonic Zhang sonic.adi@gmail.com -Active blackfin blackfin - - - bf518f-ezbrd - Sonic Zhang sonic.adi@gmail.com -Active blackfin blackfin - - - bf525-ucr2 - Haitao Zhang hzhang@ucrobotics.com:Chong Huang chuang@ucrobotics.com -Active blackfin blackfin - - - bf526-ezbrd - Sonic Zhang sonic.adi@gmail.com -Active blackfin blackfin - - - bf527-ad7160-eval - Sonic Zhang sonic.adi@gmail.com -Active blackfin blackfin - - - bf527-ezkit - Sonic Zhang sonic.adi@gmail.com -Active blackfin blackfin - - - bf527-sdp - Sonic Zhang sonic.adi@gmail.com -Active blackfin blackfin - - - bf533-ezkit - Sonic Zhang sonic.adi@gmail.com -Active blackfin blackfin - - - bf533-stamp - Sonic Zhang sonic.adi@gmail.com -Active blackfin blackfin - - - bf537-minotaur - Martin Strubel strubel@section5.ch -Active blackfin blackfin - - - bf537-pnav - Sonic Zhang sonic.adi@gmail.com -Active blackfin blackfin - - - bf537-srv1 - Martin Strubel strubel@section5.ch -Active blackfin blackfin - - - bf537-stamp - Sonic Zhang sonic.adi@gmail.com -Active blackfin blackfin - - - bf538f-ezkit - Sonic Zhang sonic.adi@gmail.com -Active blackfin blackfin - - - bf548-ezkit - Sonic Zhang sonic.adi@gmail.com -Active blackfin blackfin - - - bf561-acvilon - Valentin Yakovenkov yakovenkov@niistt.ru -Active blackfin blackfin - - - bf561-ezkit - Sonic Zhang sonic.adi@gmail.com -Active blackfin blackfin - - - bf609-ezkit - Sonic Zhang sonic.adi@gmail.com -Active blackfin blackfin - - - blackstamp - Wojtek Skulski skulski@pas.rochester.edu:Wojtek Skulski info@skutek.com:Benjamin Matthews mben12@gmail.com -Active blackfin blackfin - - - blackvme - Wojtek Skulski skulski@pas.rochester.edu:Wojtek Skulski info@skutek.com:Benjamin Matthews mben12@gmail.com -Active blackfin blackfin - - - br4 - Dimitar Penev dpn@switchfin.org -Active blackfin blackfin - - - dnp5370 - M.Hasewinkel (MHA) info@ssv-embedded.de -Active blackfin blackfin - - - ibf-dsp561 - I-SYST Micromodule support@i-syst.com -Active blackfin blackfin - - - pr1 - Dimitar Penev dpn@switchfin.org -Active blackfin blackfin - - bf527-ezkit bf527-ezkit-v2 bf527-ezkit:BF527_EZKIT_REV_2_1 Sonic Zhang sonic.adi@gmail.com +Active avr32 - at32ap700x atmel - atngw100mkii - Andreas Bießmann andreas.devel@googlemail.com +Active avr32 - at32ap700x in-circuit - grasshopper - Andreas Bießmann andreas.devel@googlemail.com +Active avr32 - at32ap700x mimc - mimc200 - Mark Jackson mpfj@mimc.co.uk +Active avr32 - at32ap700x miromico - hammerhead - Alex Raimondi alex.raimondi@miromico.ch +Active blackfin - - - - bct-brettl2 - Peter Meerwald devel@bct-electronic.com +Active blackfin - - - - bf506f-ezkit - Sonic Zhang sonic.adi@gmail.com +Active blackfin - - - - bf518f-ezbrd - Sonic Zhang sonic.adi@gmail.com +Active blackfin - - - - bf525-ucr2 - Haitao Zhang hzhang@ucrobotics.com:Chong Huang chuang@ucrobotics.com +Active blackfin - - - - bf526-ezbrd - Sonic Zhang sonic.adi@gmail.com +Active blackfin - - - - bf527-ad7160-eval - Sonic Zhang sonic.adi@gmail.com +Active blackfin - - - - bf527-ezkit - Sonic Zhang sonic.adi@gmail.com +Active blackfin - - - - bf527-sdp - Sonic Zhang sonic.adi@gmail.com +Active blackfin - - - - bf533-ezkit - Sonic Zhang sonic.adi@gmail.com +Active blackfin - - - - bf533-stamp - Sonic Zhang sonic.adi@gmail.com +Active blackfin - - - - bf537-minotaur - Martin Strubel strubel@section5.ch +Active blackfin - - - - bf537-pnav - Sonic Zhang sonic.adi@gmail.com +Active blackfin - - - - bf537-srv1 - Martin Strubel strubel@section5.ch +Active blackfin - - - - bf537-stamp - Sonic Zhang sonic.adi@gmail.com +Active blackfin - - - - bf538f-ezkit - Sonic Zhang sonic.adi@gmail.com +Active blackfin - - - - bf548-ezkit - Sonic Zhang sonic.adi@gmail.com +Active blackfin - - - - bf561-acvilon - Valentin Yakovenkov yakovenkov@niistt.ru +Active blackfin - - - - bf561-ezkit - Sonic Zhang sonic.adi@gmail.com +Active blackfin - - - - bf609-ezkit - Sonic Zhang sonic.adi@gmail.com +Active blackfin - - - - blackstamp - Wojtek Skulski skulski@pas.rochester.edu:Wojtek Skulski info@skutek.com:Benjamin Matthews mben12@gmail.com +Active blackfin - - - - blackvme - Wojtek Skulski skulski@pas.rochester.edu:Wojtek Skulski info@skutek.com:Benjamin Matthews mben12@gmail.com +Active blackfin - - - - br4 - Dimitar Penev dpn@switchfin.org +Active blackfin - - - - dnp5370 - M.Hasewinkel (MHA) info@ssv-embedded.de +Active blackfin - - - - ibf-dsp561 - I-SYST Micromodule support@i-syst.com +Active blackfin - - - - pr1 - Dimitar Penev dpn@switchfin.org +Active blackfin - - - bf527-ezkit bf527-ezkit-v2 bf527-ezkit:BF527_EZKIT_REV_2_1 Sonic Zhang sonic.adi@gmail.com Active m68k mcf5227x - freescale m52277evb M52277EVB M52277EVB:SYS_SPANSION_BOOT,SYS_TEXT_BASE=0x00000000 TsiChung Liew Tsi-Chung.Liew@freescale.com Active m68k mcf5227x - freescale m52277evb M52277EVB_stmicro M52277EVB:CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x43E00000 TsiChung Liew Tsi-Chung.Liew@freescale.com Active m68k mcf523x - freescale m5235evb M5235EVB M5235EVB:SYS_TEXT_BASE=0xFFE00000 TsiChung Liew Tsi-Chung.Liew@freescale.com @@ -494,7 +494,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 Tsi-Chung.Liew@freescale.com Active m68k mcf547x_8x - freescale m548xevb M5485GFE M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64 TsiChung Liew Tsi-Chung.Liew@freescale.com Active m68k mcf547x_8x - freescale m548xevb M5485HFE M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO TsiChung Liew Tsi-Chung.Liew@freescale.com -Active microblaze microblaze - xilinx microblaze-generic microblaze-generic - Michal Simek monstr@monstr.eu +Active microblaze - - xilinx microblaze-generic microblaze-generic - Michal Simek monstr@monstr.eu Active mips mips32 - - qemu-mips qemu_mips qemu-mips:SYS_BIG_ENDIAN Vlad Lungu vlad.lungu@windriver.com Active mips mips32 - - qemu-mips qemu_mipsel qemu-mips:SYS_LITTLE_ENDIAN - Active mips mips32 - imgtec malta malta malta:SYS_BIG_ENDIAN Paul Burton paul.burton@imgtec.com @@ -522,10 +522,10 @@ Active mips mips64 - - qemu-mips Active nds32 n1213 ag101 AndesTech adp-ag101 adp-ag101 - Andes uboot@andestech.com Active nds32 n1213 ag101 AndesTech adp-ag101p adp-ag101p - Andes uboot@andestech.com Active nds32 n1213 ag102 AndesTech adp-ag102 adp-ag102 - Andes uboot@andestech.com -Active nios2 nios2 - altera nios2-generic nios2-generic - Scott McNutt smcnutt@psyent.com -Active nios2 nios2 - psyent pci5441 PCI5441 - Scott McNutt smcnutt@psyent.com -Active nios2 nios2 - psyent pk1c20 PK1C20 - Scott McNutt smcnutt@psyent.com -Active openrisc or1200 - openrisc openrisc-generic openrisc-generic - Stefan Kristiansson stefan.kristiansson@saunalahti.fi +Active nios2 - - altera nios2-generic nios2-generic - Scott McNutt smcnutt@psyent.com +Active nios2 - - psyent pci5441 PCI5441 - Scott McNutt smcnutt@psyent.com +Active nios2 - - psyent pk1c20 PK1C20 - Scott McNutt smcnutt@psyent.com +Active openrisc - - openrisc openrisc-generic openrisc-generic - Stefan Kristiansson stefan.kristiansson@saunalahti.fi Active powerpc 74xx_7xx - - - ppmc7xx - - Active powerpc 74xx_7xx - - evb64260 P3G4 - Wolfgang Denk wd@denx.de Active powerpc 74xx_7xx - eltec elppc ELPPC - - @@ -1148,7 +1148,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 ricardo.ribalda@uam.es 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 ricardo.ribalda@uam.es Active powerpc ppc4xx - xilinx ppc440-generic xilinx-ppc440-generic_flash xilinx-ppc440-generic:SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC Ricardo Ribalda ricardo.ribalda@uam.es -Active sandbox sandbox - - sandbox sandbox - Simon Glass sjg@chromium.org +Active sandbox - - - sandbox sandbox - Simon Glass sjg@chromium.org Active sh sh2 - renesas rsk7203 rsk7203 - Nobuhiro Iwamatsu iwamatsu.nobuhiro@renesas.com:Nobuhiro Iwamatsu iwamatsu@nigauri.org Active sh sh2 - renesas rsk7264 rsk7264 - Phil Edworthy phil.edworthy@renesas.com Active sh sh2 - renesas rsk7269 rsk7269 - - @@ -1176,7 +1176,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 sjg@chromium.org +Active x86 - coreboot chromebook-x86 coreboot coreboot-x86 coreboot:SYS_TEXT_BASE=0x01110000 Simon Glass sjg@chromium.org # The following were moved to "Orphan" in June, 2014 Orphan arm arm1176 tnetv107x ti tnetv107xevm tnetv107x_evm - Chan-Taek Park c-park@ti.com Orphan arm arm926ejs at91 calao sbc35_a9g20 sbc35_a9g20_eeprom sbc35_a9g20:AT91SAM9G20,SYS_USE_EEPROM Albin Tonnerre albin.tonnerre@free-electrons.com @@ -1187,13 +1187,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 albin.tonnerre@free-electrons.com Orphan arm armv7 mx6 congatec cgtqmx6eval cgtqmx6qeval cgtqmx6eval:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q Leo Sartre lsartre@adeneo-embedded.com Orphan arm pxa - - - palmtreo680 - Mike Dunn mikedunn@newsguy.com -Orphan avr32 at32ap at32ap700x atmel - atngw100 - Haavard Skinnemoen haavard.skinnemoen@atmel.com -Orphan avr32 at32ap at32ap700x atmel atstk1000 atstk1002 - Haavard Skinnemoen haavard.skinnemoen@atmel.com -Orphan avr32 at32ap at32ap700x atmel atstk1000 atstk1003 - Haavard Skinnemoen haavard.skinnemoen@atmel.com -Orphan avr32 at32ap at32ap700x atmel atstk1000 atstk1004 - Haavard Skinnemoen haavard.skinnemoen@atmel.com -Orphan avr32 at32ap at32ap700x atmel atstk1000 atstk1006 - Haavard Skinnemoen haavard.skinnemoen@atmel.com -Orphan avr32 at32ap at32ap700x earthlcd - favr-32-ezkit - Hans-Christian Egtvedt hans-christian.egtvedt@atmel.com -Orphan blackfin blackfin - - - ip04 - Brent Kandetzki brentk@teleco.com +Orphan avr32 - at32ap700x atmel - atngw100 - Haavard Skinnemoen haavard.skinnemoen@atmel.com +Orphan avr32 - at32ap700x atmel atstk1000 atstk1002 - Haavard Skinnemoen haavard.skinnemoen@atmel.com +Orphan avr32 - at32ap700x atmel atstk1000 atstk1003 - Haavard Skinnemoen haavard.skinnemoen@atmel.com +Orphan avr32 - at32ap700x atmel atstk1000 atstk1004 - Haavard Skinnemoen haavard.skinnemoen@atmel.com +Orphan avr32 - at32ap700x atmel atstk1000 atstk1006 - Haavard Skinnemoen haavard.skinnemoen@atmel.com +Orphan avr32 - at32ap700x earthlcd - favr-32-ezkit - Hans-Christian Egtvedt hans-christian.egtvedt@atmel.com +Orphan blackfin - - - - ip04 - Brent Kandetzki brentk@teleco.com Orphan m68k mcf52x2 - freescale m5253evbe M5253EVBE - Hayden Fraser Hayden.Fraser@freescale.com Orphan powerpc mpc5xxx - - galaxy5200 galaxy5200 galaxy5200:galaxy5200 Eric Millbrandt emillbrandt@dekaresearch.com Orphan powerpc mpc5xxx - - galaxy5200 galaxy5200_LOWBOOT galaxy5200:galaxy5200_LOWBOOT Eric Millbrandt emillbrandt@dekaresearch.com @@ -1224,14 +1224,14 @@ Orphan powerpc mpc824x - - musenki Orphan powerpc mpc824x - - sandpoint Sandpoint8245 - Jim Thompson jim@musenki.com Orphan powerpc mpc8260 - - - ppmc8260 - Brad Kemp Brad.Kemp@seranoa.com # The following were moved to "Orphan" in March, 2014 -Orphan blackfin blackfin - - - cm-bf527 - Bluetechnix Tinyboards bluetechnix@blackfin.uclinux.org -Orphan blackfin blackfin - - - cm-bf533 - Bluetechnix Tinyboards bluetechnix@blackfin.uclinux.org -Orphan blackfin blackfin - - - cm-bf537e - Bluetechnix Tinyboards bluetechnix@blackfin.uclinux.org -Orphan blackfin blackfin - - - cm-bf537u - Bluetechnix Tinyboards bluetechnix@blackfin.uclinux.org -Orphan blackfin blackfin - - - cm-bf548 - Bluetechnix Tinyboards bluetechnix@blackfin.uclinux.org -Orphan blackfin blackfin - - - cm-bf561 - Bluetechnix Tinyboards bluetechnix@blackfin.uclinux.org -Orphan blackfin blackfin - - - tcm-bf518 - Bluetechnix Tinyboards bluetechnix@blackfin.uclinux.org -Orphan blackfin blackfin - - - tcm-bf537 - Bluetechnix Tinyboards bluetechnix@blackfin.uclinux.org +Orphan blackfin - - - - cm-bf527 - Bluetechnix Tinyboards bluetechnix@blackfin.uclinux.org +Orphan blackfin - - - - cm-bf533 - Bluetechnix Tinyboards bluetechnix@blackfin.uclinux.org +Orphan blackfin - - - - cm-bf537e - Bluetechnix Tinyboards bluetechnix@blackfin.uclinux.org +Orphan blackfin - - - - cm-bf537u - Bluetechnix Tinyboards bluetechnix@blackfin.uclinux.org +Orphan blackfin - - - - cm-bf548 - Bluetechnix Tinyboards bluetechnix@blackfin.uclinux.org +Orphan blackfin - - - - cm-bf561 - Bluetechnix Tinyboards bluetechnix@blackfin.uclinux.org +Orphan blackfin - - - - tcm-bf518 - Bluetechnix Tinyboards bluetechnix@blackfin.uclinux.org +Orphan blackfin - - - - tcm-bf537 - Bluetechnix Tinyboards bluetechnix@blackfin.uclinux.org Orphan powerpc mpc5xxx - matrix_vision mvbc_p MVBC_P MVBC_P:MVBC_P Andre Schwarz andre.schwarz@matrix-vision.de Orphan powerpc mpc5xxx - matrix_vision mvsmr MVSMR - Andre Schwarz andre.schwarz@matrix-vision.de Orphan powerpc mpc83xx - freescale mpc8360erdk MPC8360ERDK - Anton Vorontsov avorontsov@ru.mvista.com diff --git a/config.mk b/config.mk index 05864aa..bd74732 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 fe5c9e9..5599bb9 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) diff --git a/mkconfig b/mkconfig index 2bf5897..401f262 100755 --- a/mkconfig +++ b/mkconfig @@ -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