Change the name of the IRQ symbol in the CML2 configuration so that the DRIVER_... symbol name structure matches the name structure of the kernel source hierarchy.

This commit is contained in:
Russel Winder
2009-08-28 09:55:20 +01:00
parent 34a804eb4d
commit 591cac56cf
2 changed files with 5 additions and 5 deletions

View File

@@ -110,7 +110,7 @@ else :
subarch = items[2].lower()
if items[0] == 'DRIVER':
# Add data to the environment about which driver paths to include in the build.
configuration.env.Append(driverList = [('irq' if items[1] == 'IRQCTRL' else items[1].lower()) + '/' + items[2].lower()])
configuration.env.Append(driverList = [items[1].lower() + '/' + items[2].lower()])
configuration.Define('__ARCH__', arch)
configuration.Define('__PLATFORM__', platform)
configuration.Define('__SUBARCH__', subarch)

View File

@@ -25,7 +25,7 @@ ARM_PLATFORM_PB926 'Versatile PB926 Platform'
DRIVER_UART_PL011 'ARM UART Primecell driver PL011'
DRIVER_TIMER_SP804 'ARM Dual Timer Primecell driver SP804'
DRIVER_IRQCTRL_PL190 'ARM Vectored Interrupt Controller PL190'
DRIVER_IRQ_PL190 'ARM Vectored Interrupt Controller PL190'
main_menu 'Codezero Microkernel Configurator'
arm_menu 'ARM Architecture Configuration'
@@ -62,7 +62,7 @@ choices arm_platform_type
menu drivers_menu
DRIVER_UART_PL011
DRIVER_TIMER_SP804
DRIVER_IRQCTRL_PL190
DRIVER_IRQ_PL190
menu arm_menu
arm_cpu_type
arm_subarch_type
@@ -84,10 +84,10 @@ menu main_menu
unless ARCH_ARM suppress arm_menu
unless ARM_PLATFORM_PB926 suppress DRIVER_UART_PL011
unless ARM_PLATFORM_PB926 suppress DRIVER_TIMER_SP804
unless ARM_PLATFORM_PB926 suppress DRIVER_IRQCTRL_PL190
unless ARM_PLATFORM_PB926 suppress DRIVER_IRQ_PL190
default DRIVER_UART_PL011 from y
default DRIVER_TIMER_SP804 from y
default DRIVER_IRQCTRL_PL190 from y
default DRIVER_IRQ_PL190 from y
# USELESS!! This doesnt force it to define invisible symbols as says in the manual.
#when ARCH_TEST save SUBARCH_TEST PLATFORM_TEST
#derive SUBARCH_TEST from ARCH_TEST