From patchwork Thu Oct 8 17:48:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCHes] more kconfig boards, amd/cs5535 changes Date: Thu, 08 Oct 2009 17:48:53 -0000 From: Patrick Georgi X-Patchwork-Id: 371 Message-Id: <1255024133.5054.29.camel@tetris> To: coreboot@coreboot.org Hi, 20091008-4 is the usual "more kconfig" patch, but 20091008-3 is more complex: It makes southbridge/amd/cs5535 build with the new build system. It only worked in the old one, because chip.h is commented out in the Config.lb file (thanks Uwe for figuring that out). I simply added the normal boiler plate to actually have this stuff do something, even if it's just a printk (as southbridge_enable was already defined) Signed-off-by: Patrick Georgi Acked-by: Peter Stuge Index: src/mainboard/artecgroup/Kconfig =================================================================== --- src/mainboard/artecgroup/Kconfig (Revision 4746) +++ src/mainboard/artecgroup/Kconfig (Arbeitskopie) @@ -1 +1,8 @@ -# +choice + prompt "Mainboard model" + depends on VENDOR_ARTEC_GROUP + +source "src/mainboard/artecgroup/dbe61/Kconfig" + +endchoice + Index: src/mainboard/artecgroup/dbe61/Kconfig =================================================================== --- src/mainboard/artecgroup/dbe61/Kconfig (Revision 0) +++ src/mainboard/artecgroup/dbe61/Kconfig (Revision 0) @@ -0,0 +1,47 @@ +config BOARD_ARTECGROUP_DBE61 + bool "dbe61" + select ARCH_X86 + select CPU_AMD_LX + select NORTHBRIDGE_AMD_LX + select SOUTHBRIDGE_AMD_CS5536 + select HAVE_PIRQ_TABLE + select PIRQ_ROUTE + select UDELAY_TSC + select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 + select USE_DCACHE_RAM + select USE_PRINTK_IN_CAR + +config MAINBOARD_DIR + string + default artecgroup/dbe61 + depends on BOARD_ARTECGROUP_DBE61 + +config MAINBOARD_PART_NUMBER + string + default "DBE61" + depends on BOARD_ARTECGROUP_DBE61 + +config HAVE_OPTION_TABLE + bool + default n + depends on BOARD_ARTECGROUP_DBE61 + +config IRQ_SLOT_COUNT + int + default 3 + depends on BOARD_ARTECGROUP_DBE61 + +config DCACHE_RAM_BASE + hex + default 0xc8000 + depends on BOARD_ARTECGROUP_DBE61 + +config DCACHE_RAM_SIZE + hex + default 0x8000 + depends on BOARD_ARTECGROUP_DBE61 + +config RAMBASE + hex + default 0x4000 + depends on BOARD_ARTECGROUP_DBE61 Index: src/mainboard/artecgroup/dbe61/Makefile.inc =================================================================== --- src/mainboard/artecgroup/dbe61/Makefile.inc (Revision 0) +++ src/mainboard/artecgroup/dbe61/Makefile.inc (Revision 0) @@ -0,0 +1,31 @@ +driver-y += mainboard.o + +# Needed by irq_tables and mptable and acpi_tables. +obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o + +# This is part of the conversion to init-obj and away from included code. + +initobj-y += crt0.o +# FIXME in $(top)/Makefile +crt0-y += ../../../../src/cpu/x86/16bit/entry16.inc +crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc +crt0-y += ../../../../src/cpu/x86/16bit/reset16.inc +crt0-y += ../../../../src/arch/i386/lib/id.inc +crt0-y += ../../../../src/cpu/amd/model_lx/cache_as_ram.inc +crt0-y += auto.inc + +ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb +ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds +ldscript-y += ../../../../src/cpu/x86/16bit/reset16.lds +ldscript-y += ../../../../src/arch/i386/lib/id.lds +ldscript-y += ../../../../src/arch/i386/lib/failover.lds + +ifdef POST_EVALUATION + +$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c $(obj)/option_table.h + $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c -o $@ + perl -e 's/\.rodata/.rom.data/g' -pi $@ + perl -e 's/\.text/.section .rom.text/g' -pi $@ + +endif + Index: src/mainboard/lippert/roadrunner-lx/Kconfig =================================================================== --- src/mainboard/lippert/roadrunner-lx/Kconfig (Revision 0) +++ src/mainboard/lippert/roadrunner-lx/Kconfig (Revision 0) @@ -0,0 +1,48 @@ +config BOARD_LIPPERT_ROADRUNNER_LX + bool "RoadRunner-LX" + select ARCH_X86 + select CPU_AMD_LX + select NORTHBRIDGE_AMD_LX + select SOUTHBRIDGE_AMD_CS5536 + select SUPERIO_ITE_IT8712F + select HAVE_PIRQ_TABLE + select PIRQ_ROUTE + select UDELAY_TSC + select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 + select USE_DCACHE_RAM + select USE_PRINTK_IN_CAR + +config MAINBOARD_DIR + string + default lippert/roadrunner-lx + depends on BOARD_LIPPERT_ROADRUNNER_LX + +config MAINBOARD_PART_NUMBER + string + default "ROADRUNNERLX" + depends on BOARD_LIPPERT_ROADRUNNER_LX + +config HAVE_OPTION_TABLE + bool + default n + depends on BOARD_LIPPERT_ROADRUNNER_LX + +config IRQ_SLOT_COUNT + int + default 7 + depends on BOARD_LIPPERT_ROADRUNNER_LX + +config DCACHE_RAM_BASE + hex + default 0xc8000 + depends on BOARD_LIPPERT_ROADRUNNER_LX + +config DCACHE_RAM_SIZE + hex + default 0x8000 + depends on BOARD_LIPPERT_ROADRUNNER_LX + +config RAMBASE + hex + default 0x4000 + depends on BOARD_LIPPERT_ROADRUNNER_LX Index: src/mainboard/lippert/roadrunner-lx/Makefile.inc =================================================================== --- src/mainboard/lippert/roadrunner-lx/Makefile.inc (Revision 0) +++ src/mainboard/lippert/roadrunner-lx/Makefile.inc (Revision 0) @@ -0,0 +1,31 @@ +driver-y += mainboard.o + +# Needed by irq_tables and mptable and acpi_tables. +obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o + +# This is part of the conversion to init-obj and away from included code. + +initobj-y += crt0.o +# FIXME in $(top)/Makefile +crt0-y += ../../../../src/cpu/x86/16bit/entry16.inc +crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc +crt0-y += ../../../../src/cpu/x86/16bit/reset16.inc +crt0-y += ../../../../src/arch/i386/lib/id.inc +crt0-y += ../../../../src/cpu/amd/model_lx/cache_as_ram.inc +crt0-y += auto.inc + +ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb +ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds +ldscript-y += ../../../../src/cpu/x86/16bit/reset16.lds +ldscript-y += ../../../../src/arch/i386/lib/id.lds +ldscript-y += ../../../../src/arch/i386/lib/failover.lds + +ifdef POST_EVALUATION + +$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c + $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c -o $@ + perl -e 's/\.rodata/.rom.data/g' -pi $@ + perl -e 's/\.text/.section .rom.text/g' -pi $@ + +endif + Index: src/mainboard/lippert/Kconfig =================================================================== --- src/mainboard/lippert/Kconfig (Revision 4746) +++ src/mainboard/lippert/Kconfig (Arbeitskopie) @@ -1 +1,10 @@ -# +choice + prompt "Mainboard model" + depends on VENDOR_LIPPERT + +source "src/mainboard/lippert/frontrunner/Kconfig" +source "src/mainboard/lippert/roadrunner-lx/Kconfig" +source "src/mainboard/lippert/spacerunner-lx/Kconfig" + +endchoice + Index: src/mainboard/lippert/frontrunner/Kconfig =================================================================== --- src/mainboard/lippert/frontrunner/Kconfig (Revision 0) +++ src/mainboard/lippert/frontrunner/Kconfig (Revision 0) @@ -0,0 +1,34 @@ +config BOARD_LIPPERT_FRONTRUNNER + bool "Frontrunner" + select ARCH_X86 + select CPU_AMD_GX2 + select NORTHBRIDGE_AMD_GX2 + select SOUTHBRIDGE_AMD_CS5535 + select UDELAY_TSC + select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 + select HAVE_PIRQ_TABLE + +config MAINBOARD_DIR + string + default lippert/frontrunner + depends on BOARD_LIPPERT_FRONTRUNNER + +config MAINBOARD_PART_NUMBER + string + default "Frontrunner" + depends on BOARD_LIPPERT_FRONTRUNNER + +config HAVE_OPTION_TABLE + bool + default n + depends on BOARD_LIPPERT_FRONTRUNNER + +config IRQ_SLOT_COUNT + int + default 2 + depends on BOARD_LIPPERT_FRONTRUNNER + +config USE_INIT + bool + default n + depends on BOARD_LIPPERT_FRONTRUNNER Index: src/mainboard/lippert/frontrunner/Makefile.inc =================================================================== --- src/mainboard/lippert/frontrunner/Makefile.inc (Revision 0) +++ src/mainboard/lippert/frontrunner/Makefile.inc (Revision 0) @@ -0,0 +1,2 @@ +ROMCCFLAGS=-mcpu=i386 -O +include $(src)/mainboard/Makefile.romccboard.inc Index: src/mainboard/lippert/spacerunner-lx/Kconfig =================================================================== --- src/mainboard/lippert/spacerunner-lx/Kconfig (Revision 0) +++ src/mainboard/lippert/spacerunner-lx/Kconfig (Revision 0) @@ -0,0 +1,48 @@ +config BOARD_LIPPERT_SPACERUNNER_LX + bool "SpaceRunner-LX" + select ARCH_X86 + select CPU_AMD_LX + select NORTHBRIDGE_AMD_LX + select SOUTHBRIDGE_AMD_CS5536 + select SUPERIO_ITE_IT8712F + select HAVE_PIRQ_TABLE + select PIRQ_ROUTE + select UDELAY_TSC + select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 + select USE_DCACHE_RAM + select USE_PRINTK_IN_CAR + +config MAINBOARD_DIR + string + default lippert/spacerunner-lx + depends on BOARD_LIPPERT_SPACERUNNER_LX + +config MAINBOARD_PART_NUMBER + string + default "SPACERUNNERLX" + depends on BOARD_LIPPERT_SPACERUNNER_LX + +config HAVE_OPTION_TABLE + bool + default n + depends on BOARD_LIPPERT_SPACERUNNER_LX + +config IRQ_SLOT_COUNT + int + default 7 + depends on BOARD_LIPPERT_SPACERUNNER_LX + +config DCACHE_RAM_BASE + hex + default 0xc8000 + depends on BOARD_LIPPERT_SPACERUNNER_LX + +config DCACHE_RAM_SIZE + hex + default 0x8000 + depends on BOARD_LIPPERT_SPACERUNNER_LX + +config RAMBASE + hex + default 0x4000 + depends on BOARD_LIPPERT_SPACERUNNER_LX Index: src/mainboard/lippert/spacerunner-lx/Makefile.inc =================================================================== --- src/mainboard/lippert/spacerunner-lx/Makefile.inc (Revision 0) +++ src/mainboard/lippert/spacerunner-lx/Makefile.inc (Revision 0) @@ -0,0 +1,31 @@ +driver-y += mainboard.o + +# Needed by irq_tables and mptable and acpi_tables. +obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o + +# This is part of the conversion to init-obj and away from included code. + +initobj-y += crt0.o +# FIXME in $(top)/Makefile +crt0-y += ../../../../src/cpu/x86/16bit/entry16.inc +crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc +crt0-y += ../../../../src/cpu/x86/16bit/reset16.inc +crt0-y += ../../../../src/arch/i386/lib/id.inc +crt0-y += ../../../../src/cpu/amd/model_lx/cache_as_ram.inc +crt0-y += auto.inc + +ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb +ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds +ldscript-y += ../../../../src/cpu/x86/16bit/reset16.lds +ldscript-y += ../../../../src/arch/i386/lib/id.lds +ldscript-y += ../../../../src/arch/i386/lib/failover.lds + +ifdef POST_EVALUATION + +$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c + $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c -o $@ + perl -e 's/\.rodata/.rom.data/g' -pi $@ + perl -e 's/\.text/.section .rom.text/g' -pi $@ + +endif +