populated options with group tags

1 files changed, 346 insertions, 346 deletions

diff --git a/rtems_waf/defaults/options.py b/rtems_waf/defaults/options.py
index bb57788ddb..7ea9dc7139 100644
--- a/rtems_waf/defaults/options.py
+++ b/rtems_waf/defaults/options.py
@@ -3,28 +3,28 @@ from rtems_waf.config.options import Boolean, Integer, String, StringList
 
 class ALLOW_IRQ_NESTING(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "If set to !0, allow nested irq processing"
 
 
 class ARM_CLK(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Arm clock in hz"
 
 
 class BENCHMARK_IRQ_PROCESSING(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "If set to !0, enable code to benchmark irq processing"
 
 
 class BFIN_ON_SKYEYE(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 If defined, disable features which are not supported on skyeye.
@@ -40,28 +40,28 @@ class BSP(StringList):
 
 class BSP_CONSOLE_BAUD(Integer):
 	value	= 9600
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "The default console baud rate."
 
 
 class BSP_CPU_CLOCK_SPEED(Integer):
 	value	= 0
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "The cpu clock frequency."
 
 
 class BSP_DATA_CACHE_ENABLED(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["storage"]
 	undef	= True
 	descr	= "Enables the data cache, if defined to a value other than zero"
 
 
 class BSP_DIRTY_MEMORY(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["storage"]
 	undef	= True
 	descr	= """
 If defined, then the bsp framework will put a non-zero pattern into the rtems
@@ -72,14 +72,14 @@ memory starts set to zero.
 
 class BSP_DISABLE_UBOOT_WORK_AREA_CONFIG(Integer):
 	value	= 1
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Disable u-boot work area configuration"
 
 
 class BSP_GPIOPCR_INITMASK(String):
 	value	= "0x330F0F77"
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 Defines the bits modified in the mpc5200 gpiopcr register during init. Must
@@ -89,7 +89,7 @@ match the hardware requirements
 
 class BSP_GPIOPCR_INITVAL(String):
 	value	= "0x01050444"
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 Defines the bit values written in the mpc5200 gpiopcr register during init.
@@ -99,14 +99,14 @@ Must match the hardware requirements
 
 class BSP_HAS_RM52xx(Integer):
 	value	= 1
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "This bsp has a rm52xx compatible cpu."
 
 
 class BSP_HAS_SMP(Integer):
 	value	= 1
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= """
 Always defined when on a pc386 to enable the pc386 support for  determining
@@ -116,21 +116,21 @@ the cpu core number in an smp configuration.
 
 class BSP_HAS_TX49xx(Integer):
 	value	= 1
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "This bsp has a rm52xx compatible cpu."
 
 
 class BSP_HAS_USC320(Integer):
 	value	= 1
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "This bsp has a v3 usc320 system controller chip."
 
 
 class BSP_INSTRUCTION_CACHE_ENABLED(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["storage"]
 	undef	= True
 	descr	= """
 Enables the instruction cache, if defined to a value other than zero
@@ -139,14 +139,14 @@ Enables the instruction cache, if defined to a value other than zero
 
 class BSP_INTERRUPT_STACK_AT_WORK_AREA_BEGIN(Integer):
 	value	= 1
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Indicate that the interrupt stack is at the work area begin"
 
 
 class BSP_LEON3_SMP(Integer):
 	value	= 1
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= """
 Always defined when on a leon3 to enable the leon3 support for  determining
@@ -156,7 +156,7 @@ the cpu core number in an smp configuration.
 
 class BSP_PRESS_KEY_FOR_RESET(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 If defined, print a message and wait until pressed before resetting board when
@@ -166,28 +166,28 @@ application exits.
 
 class BSP_RESET_BOARD_AT_EXIT(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "If defined, reset the board when the application exits."
 
 
 class BSP_SMALL_MEMORY(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["storage"]
 	undef	= True
 	descr	= "Disable testsuite samples with high memory demands"
 
 
 class BSP_START_RESET_VECTOR(String):
 	value	= ""
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Reset vector address for bsp start"
 
 
 class BSP_UART_AVAIL_MASK(String):
 	value	= "0x01"
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= """
 Bit mask to specify the uarts (pscs), which should be enabled on this board.
@@ -197,7 +197,7 @@ Must match the hardware requirements. Psc1 corresponds to the lsb
 
 class BSP_USE_NETWORK_FEC(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= """
 If defined, then the bsp will use the fast ethernet controller for 10/100mbit
@@ -207,7 +207,7 @@ networking and used as primary networking interface.
 
 class BSP_USE_NETWORK_SCC(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= """
 If defined, then the bsp will use the serial communications controller (scc1)
@@ -217,98 +217,98 @@ for 10mbit networking.
 
 class BSP_USE_UART2(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "If defined, enables uart2."
 
 
 class BSP_USE_UART_INTERRUPTS(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Enable usage of interrupts for the uart modules"
 
 
 class BSP_VIDEO_80x50(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "If defined, set the vga display to 80x50."
 
 
 class CC(String):
 	value	= ""
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "C compiler command"
 
 
 class CCAS(String):
 	value	= ""
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Assembler compiler command (defaults to CC)"
 
 
 class CCASFLAGS(String):
 	value	= ""
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Assembler compiler flags (defaults to cflags)"
 
 
 class CCLK(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Cpu clock in hz"
 
 
 class CD2401_INT_LEVEL(Integer):
 	value	= 1
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Interrupt level for the cd2401 (when cd2401_io_mode == 1)."
 
 
 class CD2401_IO_MODE(Integer):
 	value	= 0
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "0 for polled I/O, 1 for interrupt-driven."
 
 
 class CD2401_USE_TERMIOS(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Enable using termios based console."
 
 
 class CFLAGS(StringList):
 	value	= []
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "C compiler flags"
 
 
 class CFLAGS_DEBUG(String):
 	value	= ""
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Debug compiler flags."
 
 
 class CFLAGS_OPTIMISE(String):
 	value	= ""
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Compiler flags for optimisation"
 
 
 class CLOCK_DRIVER_USE_8254(Integer):
 	value	= 0
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 If enabled, the clock driver will use the good old 8254 chip  to report
@@ -322,7 +322,7 @@ switch.
 
 class CLOCK_DRIVER_USE_8254CLOCK_DRIVER_USE_TSC(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 If enabled, the clock driver will use the good old 8254 chip to report
@@ -335,7 +335,7 @@ you do not mind adding roughly 5 microseconds to each context switch.
 
 class CLOCK_DRIVER_USE_FAST_IDLE(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 This sets a mode where the time runs as fast as possible when  a clock isr
@@ -346,7 +346,7 @@ simulation times.
 
 class CLOCK_DRIVER_USE_TSC(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 If enabled, the clock driver will use the tsc register available with pentium-
@@ -364,21 +364,21 @@ rate tsc regardless.
 
 class CONFIG_CFLAGS(StringList):
 	value	= []
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Default compiler flags for rtems-config"
 
 
 class CONFIG_CONSOLE(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Configuration for console (uart 0)"
 
 
 class CONFIG_FPSP(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 If defined enables the motorola floating point support package (fpsp)
@@ -387,98 +387,98 @@ If defined enables the motorola floating point support package (fpsp)
 
 class CONFIG_I2C_0(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Configuration for i2c 0"
 
 
 class CONFIG_I2C_1(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Configuration for i2c 1"
 
 
 class CONFIG_I2C_2(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Configuration for i2c 2"
 
 
 class CONFIG_LDFLAGS(StringList):
 	value	= []
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Default linker flags for rtems-config"
 
 
 class CONFIG_LIBS(StringList):
 	value	= []
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "= Default libraries for rtems-config"
 
 
 class CONFIG_U3CLK(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Clock configuration for uart 3"
 
 
 class CONFIG_U4CLK(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Clock configuration for uart 4"
 
 
 class CONFIG_U5CLK(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Clock configuration for uart 5"
 
 
 class CONFIG_U6CLK(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Clock configuration for uart 6"
 
 
 class CONFIG_UART_1(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Configuration for uart 1"
 
 
 class CONFIG_UART_2(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Configuration for uart 2"
 
 
 class CONFIG_UART_3(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Configuration for uart 3"
 
 
 class CONFIG_UART_CLKMODE(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Clock mode configuration for uarts"
 
 
 class CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 If defined then the bsp may reduce the available memory size initially. This
@@ -492,7 +492,7 @@ is saved.
 
 class CONS_SCC1_MODE(String):
 	value	= "CONS_MODE_UNUSED"
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= """
 (Bsp--scc1 uart if mode) must be defined if scc1 is used as a tty (uart)
@@ -503,7 +503,7 @@ interrupt driven (spooled) operation. Set it to cons_mode_unused, if not used
 
 class CONS_SCC2_MODE(String):
 	value	= "CONS_MODE_UNUSED"
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= """
 (Bsp--scc2 uart if mode) must be defined if scc2 is used as a tty (uart)
@@ -514,7 +514,7 @@ interrupt driven (spooled) operation. Set it to cons_mode_unused, if not used
 
 class CONS_SCC3_MODE(String):
 	value	= "CONS_MODE_UNUSED"
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= """
 (Bsp--scc3 uart if mode) must be defined if scc3 is used as a tty (uart)
@@ -525,7 +525,7 @@ interrupt driven (spooled) operation. Set it to cons_mode_unused, if not used
 
 class CONS_SCC4_MODE(String):
 	value	= "CONS_MODE_UNUSED"
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= """
 (Bsp--scc4 uart if mode) must be defined if scc4 is used as a tty (uart)
@@ -536,7 +536,7 @@ interrupt driven (spooled) operation. Set it to cons_mode_unused, if not used
 
 class CONS_SMC1_MODE(String):
 	value	= "CONS_MODE_UNUSED"
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= """
 (Bsp--smc1 uart if mode) must be defined if smc1 is used as a tty (uart)
@@ -548,7 +548,7 @@ used])
 
 class CONS_SMC2_MODE(String):
 	value	= "CONS_MODE_UNUSED"
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= """
 (Bsp--smc2 uart if mode) must be defined if smc2 is used as a tty (uart)
@@ -559,14 +559,14 @@ interrupt driven (spooled) operation. Set it to cons_mode_unused, if not used
 
 class CONSOLE_BAUDRATE(Integer):
 	value	= 9600
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "The baudrate of the console uart."
 
 
 class CONSOLE_CHN(String):
 	value	= "CONS_CHN_SMC1"
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 Bsp--console driver) must be defined to be one of cons_chn_smc1,
@@ -577,7 +577,7 @@ Determines which device will be registered as /Dev/Console.
 
 class CONSOLE_MINOR(String):
 	value	= "SMC1_MINOR"
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 Port to use for the rtems console: 0 - /Dev/Tty0, serial port 1/Console on the
@@ -588,7 +588,7 @@ serial port 3 on the mvme712m, 3 - /Dev/Tty3, serial port 4 on the mvme712m.])
 
 class CONSOLE_MINOR_DUPLICATE(String):
 	value	= "SMC2_MINOR"
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 Bsp--console driver) must be defined to be one of smc1_minor, smc2_minor,
@@ -599,7 +599,7 @@ registered as /Dev/Console.
 
 class CONSOLE_USE_INTERRUPTS(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["general"]
 	undef	= False
 	descr	= """
 The erc32 console driver can operate in either polled or interrupt mode. Under
@@ -613,147 +613,147 @@ sis has no chance of getting the data out.
 
 class CPU_CLOCK_RATE_HZ(Integer):
 	value	= 20000000
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Cpu clock rate in hz"
 
 
 class DISABLE_MMU(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["storage"]
 	undef	= True
 	descr	= "Disable mmu"
 
 
 class DISABLE_READ_ONLY_PROTECTION(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["storage"]
 	undef	= True
 	descr	= "Disable mmu protection of read-only sections"
 
 
 class DISABLE_READ_WRITE_DATA_CACHE(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["storage"]
 	undef	= True
 	descr	= "Disable cache for read-write data sections"
 
 
 class DISPATCH_HANDLER_STAT(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Used by irq/Irq.C"
 
 
 class EMC_MICRON(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Enable micron configuration for emc"
 
 
 class EMC_NUMONYX(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Enable numonyx configuration for emc"
 
 
 class EMC_TEST(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Enable tests for emc"
 
 
 class ENABLE(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Whether a bsp is enabled or disabled for use."
 
 
 class ENABLE_DEBUG(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Enable debug build."
 
 
 class ENABLE_FPSP(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Motorola floating point support package (fpsp)"
 
 
 class ENABLE_LCD(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "If defined, enable use of the sed1356 controller and LCD."
 
 
 class ENABLE_MP(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Enable multiprocessing."
 
 
 class ENABLE_MULTILIB(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "???"
 
 
 class ENABLE_NETWORKING(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Enable tcp/Ip stack."
 
 
 class ENABLE_NEWLIB(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "???"
 
 
 class ENABLE_POSIX(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Enable posix."
 
 
 class ENABLE_PTHREADS(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Enable pthreads, requires posix."
 
 
 class ENABLE_SERDBG(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "???"
 
 
 class ENABLE_SHELL(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "???"
 
 
 class ENABLE_SIS_QUIRKS(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 If defined, then the sis simulator specific code in the bsp will be enabled.
@@ -763,63 +763,63 @@ In particular, sis requires special initialization not used on real erc32
 
 class ENABLE_SMP(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Enable smp, available for i386/Sparc only."
 
 
 class ENABLE_UMON(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "If defined, enable use of the umon console."
 
 
 class ENABLE_UMON_CONSOLE(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "If defined, enable use of the micromonitor console device."
 
 
 class ENABLE_USART0(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "If defined, enable use of the usart 0."
 
 
 class ENABLE_USART1(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "If defined, enable use of the usart 1."
 
 
 class ENABLE_USART2(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "If defined, enable use of the usart 2."
 
 
 class ENABLE_USART3(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "If defined, enable use of the usart 3."
 
 
 class ENABLE_WATCHDOG_RESET(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Bsp_reset() will use the watchdog to reset the chip"
 
 
 class EPPCBUG_SMC1(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= """
 If defined, smc1 is in use by eppc-bug. The console driver will not re-
@@ -829,7 +829,7 @@ initialize that port.
 
 class EPPCBUG_VECTORS(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= """
 (Bsp--rtems) if defined, vectors branch to eppcbug, except the following:
@@ -839,21 +839,21 @@ class EPPCBUG_VECTORS(Boolean):
 
 class ETHERNET_RMII(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Enable rmii for ethernet"
 
 
 class GEN83XX_ENABLE_INTERRUPT_NESTING(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Enable interrupt nesting"
 
 
 class HAS_DBUG(Integer):
 	value	= 0
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 If defined, we will not boot from reset, but from freescale dbug monitor.
@@ -862,7 +862,7 @@ If defined, we will not boot from reset, but from freescale dbug monitor.
 
 class HAS_LOW_LEVEL_INIT(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 If defined, we will do all the low level init of the chip (like
@@ -872,28 +872,28 @@ bus/Memory...).
 
 class HAS_PMC_PSC8(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Whether has a psc8 pmc board attached to pmc slot"
 
 
 class HAS_SMC91111(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "If defined the board has the smc91111 networking chip."
 
 
 class HAS_UBOOT(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Enable u-boot startup"
 
 
 class HAVE_SHSIM_IOMEM_PATCH(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= """
 Whether support for functional iomem in shsim/Gdb shall be enabled
@@ -902,21 +902,21 @@ Whether support for functional iomem in shsim/Gdb shall be enabled
 
 class HCLK(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Ahb bus clock in hz"
 
 
 class HEAP_EXTEND(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Enable heap extend by ethernet and usb regions"
 
 
 class IDE_USE_PRIMARY_INTERFACE(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 Determines, whether rtems will try to use the primary ide interface. Disable
@@ -928,7 +928,7 @@ interface.
 
 class IDE_USE_SECONDARY_INTERFACE(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 Determines, whether rtems will try to use the secondary ide interface.  Enable
@@ -940,21 +940,21 @@ interface.
 
 class INITIALIZE_COM_PORTS(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "???"
 
 
 class INTERRUPT_USE_TABLE(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Select if interrupt use table or link list"
 
 
 class LDFLAGS(StringList):
 	value	= []
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= """
 Linker flags only, do not use this for directories or libraries
@@ -963,147 +963,147 @@ Linker flags only, do not use this for directories or libraries
 
 class LIBS(StringList):
 	value	= []
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Libraries to pass to the linker, e.G. -L<library>"
 
 
 class LINK_END(StringList):
 	value	= []
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Objects linked last"
 
 
 class LINK_START(StringList):
 	value	= []
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Objects linked first"
 
 
 class LINK_LINK(StringList):
 	value	= ["-L${RTEMS} -T ${RTEMS}/linkcmds -dc -dp -N"]
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Linker link flags"
 
 
 class LINKCMDS(StringList):
 	value	= []
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Linker command files, first one is installed as linkcmds"
 
 
 class LPC24XX_CCLK(String):
 	value	= "72000000U"
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Cpu clock in hz"
 
 
 class LPC24XX_CONFIG_CONSOLE(Integer):
 	value	= 0
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Configuration for console (uart 0)"
 
 
 class LPC24XX_CONFIG_I2C_0(Integer):
 	value	= 0
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Configuration for i2c 0"
 
 
 class LPC24XX_CONFIG_I2C_1(Integer):
 	value	= 1
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Configuration for i2c 1"
 
 
 class LPC24XX_CONFIG_I2C_2(String):
 	value	= ""
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Configuration for i2c 2"
 
 
 class LPC24XX_CONFIG_UART_1(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Configuration for uart 1"
 
 
 class LPC24XX_CONFIG_UART_2(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Configuration for uart 2"
 
 
 class LPC24XX_CONFIG_UART_3(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Configuration for uart 3"
 
 
 class LPC24XX_EMC_MICRON(Integer):
 	value	= 1
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Enable micron configuration for emc"
 
 
 class LPC24XX_EMC_NUMONYX(Integer):
 	value	= 1
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Enable numonyx configuration for emc"
 
 
 class LPC24XX_EMC_TEST(String):
 	value	= ""
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Enable tests for emc"
 
 
 class LPC24XX_ETHERNET_RMII(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Enable rmii for ethernet"
 
 
 class LPC24XX_HEAP_EXTEND(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Enable heap extend by ethernet and usb regions"
 
 
 class LPC24XX_OSCILLATOR_MAIN(String):
 	value	= "12000000U"
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Main oscillator frequency in hz"
 
 
 class LPC24XX_OSCILLATOR_RTC(String):
 	value	= "32768U"
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Rtc oscillator frequency in hz"
 
 
 class LPC24XX_SPECIAL_TASK_STACKS_SUPPORT(Integer):
 	value	= 1
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 Enable special task stack support for task stacks in internal ram
@@ -1112,224 +1112,224 @@ Enable special task stack support for task stacks in internal ram
 
 class LPC24XX_STOP_ETHERNET(Integer):
 	value	= 1
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Stop ethernet controller at start-up to avoid dma interference"
 
 
 class LPC24XX_STOP_GPDMA(Integer):
 	value	= 1
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Stop general purpose dma at start-up to avoid dma interference"
 
 
 class LPC24XX_STOP_USB(Integer):
 	value	= 1
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Stop usb controller at start-up to avoid dma interference"
 
 
 class LPC24XX_UART_BAUD(String):
 	value	= "115200U"
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Baud for uarts"
 
 
 class LPC32XX_ARM_CLK(String):
 	value	= "208000000U"
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Arm clock in hz"
 
 
 class LPC32XX_CONFIG_U3CLK(String):
 	value	= ""
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Clock configuration for uart 3"
 
 
 class LPC32XX_CONFIG_U4CLK(String):
 	value	= ""
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Clock configuration for uart 4"
 
 
 class LPC32XX_CONFIG_U5CLK(String):
 	value	= "0x00001386U"
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Clock configuration for uart 5"
 
 
 class LPC32XX_CONFIG_U6CLK(String):
 	value	= ""
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Clock configuration for uart 6"
 
 
 class LPC32XX_CONFIG_UART_CLKMODE(String):
 	value	= "0x00000200U"
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Clock mode configuration for uarts"
 
 
 class LPC32XX_DISABLE_MMU(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["storage"]
 	undef	= True
 	descr	= "Disable mmu"
 
 
 class LPC32XX_DISABLE_READ_ONLY_PROTECTION(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["storage"]
 	undef	= True
 	descr	= "Disable mmu protection of read-only sections"
 
 
 class LPC32XX_DISABLE_READ_WRITE_DATA_CACHE(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["storage"]
 	undef	= True
 	descr	= "Disable cache for read-write data sections"
 
 
 class LPC32XX_ENABLE_WATCHDOG_RESET(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Enable watchdog reset"
 
 
 class LPC32XX_ETHERNET_RMII(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Enable rmii for ethernet"
 
 
 class LPC32XX_HCLK(String):
 	value	= "104000000U"
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Ahb bus clock in hz"
 
 
 class LPC32XX_OSCILLATOR_MAIN(String):
 	value	= "13000000U"
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Main oscillator frequency in hz"
 
 
 class LPC32XX_OSCILLATOR_RTC(String):
 	value	= "32768U"
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Rtc oscillator frequency in hz"
 
 
 class LPC32XX_PERIPH_CLK(String):
 	value	= "13000000U"
-	tag   = [""]
+	tag   = ["geenral"]
 	undef	= True
 	descr	= "Peripheral clock in hz"
 
 
 class LPC32XX_SCRATCH_AREA_SIZE(Integer):
 	value	= 4096
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Size of scratch area"
 
 
 class LPC32XX_STOP_ETHERNET(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Stop ethernet controller at start-up to avoid dma interference"
 
 
 class LPC32XX_STOP_GPDMA(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Stop general purpose dma at start-up to avoid dma interference"
 
 
 class LPC32XX_STOP_USB(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Stop usb controller at start-up to avoid dma interference"
 
 
 class LPC32XX_UART_1_BAUD(String):
 	value	= ""
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Baud for uart 1"
 
 
 class LPC32XX_UART_2_BAUD(String):
 	value	= ""
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Baud for uart 2"
 
 
 class LPC32XX_UART_7_BAUD(String):
 	value	= ""
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Baud for uart 7"
 
 
 class MPC5200_PSC_INDEX_FOR_GPS_MODULE(Integer):
 	value	= 0
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Psc index for gps module, if defined results in '/Dev/Gps'"
 
 
 class MPC55XX_BOARD_GWLCFM(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "If defined, use custom settings for gwlcfm board"
 
 
 class MPC55XX_BOARD_MPC5566EVB(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "If defined, use custom settings for mpc5566evb board"
 
 
 class MPC55XX_BOARD_MPC5674FEVB(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "If defined, use custom settings for mpc5674fevb board"
 
 
 class MPC55XX_BOARD_PHYCORE_MPC5554(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "If defined, use custom settings for phycore mpc5554 board"
 
 
 class MPC55XX_BOOTFLAGS(String):
 	value	= ""
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= """
 If defined, builds in bootflags above the rchw for setup in a debugger to
@@ -1339,14 +1339,14 @@ avoid startup mmu setup
 
 class MPC55XX_CHIP_TYPE(Integer):
 	value	= 5554
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Specifies the chip type in use (e.G. 5554 for mpc5554"
 
 
 class MPC55XX_CLOCK_EMIOS_CHANNEL(String):
 	value	= "MPC55XX_EMIOS_CHANNEL_NUMBER-1"
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= """
 Define to the emios channel to use for the bsp clock.  The default is the last
@@ -1356,14 +1356,14 @@ channel.
 
 class MPC55XX_EMIOS_PRESCALER(Integer):
 	value	= 1
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Must be defined to set the emios prescaler"
 
 
 class MPC55XX_ESCI_CONSOLE_MINOR(Integer):
 	value	= 0
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 Determines which esci device will be registered as /Dev/Console
@@ -1372,7 +1372,7 @@ Determines which esci device will be registered as /Dev/Console
 
 class MPC55XX_ESCI_USE_INTERRUPTS(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= """
 Define to zero or one to disable or enable interrupts for the esci devices
@@ -1381,7 +1381,7 @@ Define to zero or one to disable or enable interrupts for the esci devices
 
 class MPC55XX_FMPLL_CLK_OUT(Integer):
 	value	= 128000000
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 Must be defined to be the pll output clock (in hz) for clock generation
@@ -1390,7 +1390,7 @@ Must be defined to be the pll output clock (in hz) for clock generation
 
 class MPC55XX_FMPLL_MFD(Integer):
 	value	= 12
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 Must be defined to be the pll multiplication factor for clock generation
@@ -1399,7 +1399,7 @@ Must be defined to be the pll multiplication factor for clock generation
 
 class MPC55XX_FMPLL_PREDIV(Integer):
 	value	= 1
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 Must be defined to be the pll predivider factor for clock generation
@@ -1408,7 +1408,7 @@ Must be defined to be the pll predivider factor for clock generation
 
 class MPC55XX_FMPLL_REF_CLOCK(Integer):
 	value	= 8000000
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 Must be defined to be the external reference clock (in hz) for clock
@@ -1418,7 +1418,7 @@ generation
 
 class NVRAM_CONFIGURE(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["storage"]
 	undef	= True
 	descr	= """
 Define to 1 if you want the console driver, network driver and caches
@@ -1432,7 +1432,7 @@ configured at boot time based on the information supplied in this file.
 
 class ON_SIMULATOR(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= """
 If defined, this indicates the bsp is being built to run on the lm32 simulator
@@ -1445,7 +1445,7 @@ It also enables a special exit and alternate printk support.
 
 class ON_SKYEYE(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 If defined, enable options which optimize executingon the skyeye simulator.
@@ -1457,35 +1457,35 @@ execute the rtems test suites.
 
 class OSCILLATOR_MAIN(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Main oscillator frequency in hz"
 
 
 class OSCILLATOR_RTC(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Rtc oscillator frequency in hz"
 
 
 class PATH_TOOLS(String):
 	value	= ""
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Location of rtems tools."
 
 
 class PERIPH_CLK(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Peripheral clock in hz"
 
 
 class PPC_USE_SPRG(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= """
 If defined, then the powerpc specific code in rtems will use some of the
@@ -1496,7 +1496,7 @@ use of these registers can conflict with other tools like debuggers.
 
 class PPC_VECTOR_FILE_BASE(String):
 	value	= "0x0100"
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= """
 This defines the base address of the exception table.  Note: vectors are
@@ -1506,14 +1506,14 @@ actually at 0xfff00000 but file starts at offset.
 
 class PREFIX(String):
 	value	= ""
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Install prefix."
 
 
 class PRINTK_CHN(String):
 	value	= "NOT_DEFINED_IN_BSP"
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 (Bsp--console driver) must be defined to be one of cons_chn_smc1,
@@ -1527,7 +1527,7 @@ with each other.
 
 class PRINTK_IO_MODE(Integer):
 	value	= 0
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 (Bsp--console driver)  define to 0 or 1 if you want polled I/O performed by
@@ -1541,7 +1541,7 @@ debug port, which must be smc1.  Printk always uses polled output.
 
 class PRINTK_MINOR(String):
 	value	= "NOT_DEFINED_IN_BSP"
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 Port to use for the rtems console: 0 - /Dev/Tty0, serial port 1/Console on the
@@ -1552,7 +1552,7 @@ serial port 3 on the mvme712m, 3 - /Dev/Tty3, serial port 4 on the mvme712m.])
 
 class PRINTK_MINOR_DUPLICATE(String):
 	value	= "SMC2_MINOR"
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 (Bsp--console driver)  must be defined to be one of smc1_minor, smc2_minor,
@@ -1565,7 +1565,7 @@ same type of I/O, otherwise the drivers will likely conflict with each other.
 
 class QORIQ_CLOCK_TIMER(Integer):
 	value	= 0
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 Global timer used for system clock, 0..3 maps to a0..a3, and 4..7 maps to
@@ -1575,119 +1575,119 @@ b0..b3
 
 class QORIQ_ETSEC_1_PHY_ADDR(Integer):
 	value	= -1
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Phy address for etsec interface 1"
 
 
 class QORIQ_ETSEC_2_PHY_ADDR(Integer):
 	value	= 0
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Phy address for etsec interface 2"
 
 
 class QORIQ_ETSEC_3_PHY_ADDR(Integer):
 	value	= 1
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Phy address for etsec interface 3"
 
 
 class QORIQ_INITIAL_MSR(String):
 	value	= "0x02000200"
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Initial msr value"
 
 
 class QORIQ_INITIAL_SPEFSCR(String):
 	value	= "0x00000000"
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Initial spefscr value"
 
 
 class QORIQ_INTERCOM_AREA_BEGIN(String):
 	value	= "0x3000000"
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Inter-processor communication area begin"
 
 
 class QORIQ_INTERCOM_AREA_SIZE(String):
 	value	= "0x1000000"
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Inter-processor communication area size"
 
 
 class QORIQ_UART_0_ENABLE(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Use 1 to enable uart 0, otherwise use 0"
 
 
 class QORIQ_UART_1_ENABLE(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Use 1 to enable uart 1, otherwise use 0"
 
 
 class QORIQ_UART_BRIDGE_0_ENABLE(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Use 1 to enable uart 0 to intercom bridge, otherwise use 0"
 
 
 class QORIQ_UART_BRIDGE_1_ENABLE(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Use 1 to enable uart 1 to intercom bridge, otherwise use 0"
 
 
 class QORIQ_UART_BRIDGE_MASTER_CORE(Integer):
 	value	= 0
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Uart to intercom bridge master core index"
 
 
 class QORIQ_UART_BRIDGE_SLAVE_CORE(Integer):
 	value	= 1
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Uart to intercom bridge slave core index"
 
 
 class QORIQ_UART_BRIDGE_TASK_PRIORITY(Integer):
 	value	= 250
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Uart to intercom bridge task priority"
 
 
 class RTEMS_BSP_I2C_EEPROM_DEVICE_NAME(String):
 	value	= "eeprom"
-	tag   = [""]
+	tag   = ["storage"]
 	undef	= True
 	descr	= "Eeprom name for libi2c"
 
 
 class RTEMS_BSP_I2C_EEPROM_DEVICE_PATH(String):
 	value	= "/dev/i2c1.eeprom"
-	tag   = [""]
+	tag   = ["storage"]
 	undef	= True
 	descr	= "Eeprom device file path"
 
 
 class RTEMS_XPARAMETERS_H(String):
 	value	= "<xparameters_dflt.h>"
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 This defines the location of the hardware specific xparameters.H
@@ -1696,49 +1696,49 @@ This defines the location of the hardware specific xparameters.H
 
 class RTEMS_XPPC_BASE(String):
 	value	= "."
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Defines path to xilinx xps ppc libraries."
 
 
 class SCORE603E_OPEN_FIRMWARE(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Use open firmware rom monitor"
 
 
 class SCORE603E_USE_DINK(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "???"
 
 
 class SCORE603E_USE_NONE(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Use no rom monitor"
 
 
 class SCORE603E_USE_SDS(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Use sds rom monitor"
 
 
 class SCRATCH_AREA_SIZE(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Size of scratch area"
 
 
 class SIMSPARC_FAST_IDLE(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= """
 If defined, speed up the clock ticks while the idle task is running so time
@@ -1749,14 +1749,14 @@ required to execute the rtems test suites.
 
 class SINGLE_CHAR_MODE(String):
 	value	= ""
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Enable single character mode for the psc console driver"
 
 
 class SMC91111_ENADDR_IS_SETUP(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 If defined the smc91111 chip has the ethernet address loaded at reset.
@@ -1765,7 +1765,7 @@ If defined the smc91111 chip has the ethernet address loaded at reset.
 
 class SPECIAL_TASK_STACKS_SUPPORT(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= """
 Enable special task stack support for task stacks in internal ram.
@@ -1774,7 +1774,7 @@ Enable special task stack support for task stacks in internal ram.
 
 class SPI_BOARD_INIT_FNC(String):
 	value	= "bsp_dummy_spi_init"
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= """
 (Bsp--spi board init function) specify the function that inits the board port
@@ -1784,7 +1784,7 @@ lines and further devices.
 
 class SPI_SEND_ADDR_FNC(String):
 	value	= "bsp_dummy_spi_sel_addr"
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= """
 Bsp--spi send address function) specify the function that addresses spi
@@ -1794,7 +1794,7 @@ devices. Set to bsp_dummy_spi_sel_addr for dummy implementation
 
 class SPI_SEND_STOP_FNC(String):
 	value	= "bsp_dummy_spi_send_stop"
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= """
 Bsp--spi send stop function) specify the function that deaddresses spi
@@ -1804,7 +1804,7 @@ devices. Set to bsp_dummy_spi_send_stop for dummy implementation
 
 class STANDALONE_EVB(String):
 	value	= ""
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 If defined, compiles code to jump-start from flash, without a monitor
@@ -1813,7 +1813,7 @@ If defined, compiles code to jump-start from flash, without a monitor
 
 class START_HW_INIT(String):
 	value	= ""
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= """
 If defined, selects whether 'early_hw_init()' is called from 'start.S';
@@ -1823,63 +1823,63 @@ If defined, selects whether 'early_hw_init()' is called from 'start.S';
 
 class STOP_ETHERNET(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Stop ethernet controller at start-up to avoid dma interference"
 
 
 class STOP_GPDMA(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Stop general purpose dma at start-up to avoid dma interference"
 
 
 class STOP_USB(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Stop usb controller at start-up to avoid dma interference"
 
 
 class TESTS_USE_PRINTK(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Tests use printk() for output"
 
 
 class UART_1_BAUD(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Baud for uart 1"
 
 
 class UART_2_BAUD(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Baud for uart 2"
 
 
 class UART_7_BAUD(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Baud for uart 7"
 
 
 class UART_BAUD(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Baud for uarts"
 
 
 class UART_USE_DMA(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= """
 The uart driver can operate in dma mode with interrupts. Set true if dma
@@ -1889,7 +1889,7 @@ operation is required
 
 class UARTS_IO_MODE(Integer):
 	value	= 0
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= """
 Define to 0 or 1 if you want polled I/O performed by rtems.  Define to 1 if
@@ -1906,7 +1906,7 @@ be smc1.
 
 class UARTS_USE_TERMIOS(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= """
 Define to 1 if you want termios support for every port.  Termios support is
@@ -1916,14 +1916,14 @@ independent of the choice of uart I/O mode.
 
 class UARTS_USE_TERMIOS_INT(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["network"]
 	undef	= True
 	descr	= "Enable interrupt support for the psc console driver"
 
 
 class USE_COM1_AS_CONSOLE(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 Determines, whether the console will be associated with the standard vga
@@ -1934,7 +1934,7 @@ support printk.
 
 class WATCHDOG_TIMEOUT(String):
 	value	= "0xFFFF"
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 Define to the desired timeout (in steps of 1/20 msec) to enable the watchdog.
@@ -1947,7 +1947,7 @@ Default is to disable the watchdog entirely.
 
 class BOARD_PHYCORE_MPC5554(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= """
 If defined, use custom settings for the phytec phycore mpc5554 som
@@ -1956,14 +1956,14 @@ If defined, use custom settings for the phytec phycore mpc5554 som
 
 class BSP_TYPE_DP2(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Enable settings for dp2"
 
 
 class csb637(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= """
 If defined, this indicates that the bsp is being built for the  csb637
@@ -1973,121 +1973,121 @@ variant.
 
 class GEN68360(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "If defined, use custom settings for the gen68360 bsp."
 
 
 class GEN68360_040(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "If defined, use custom settings for the gen68360_040 bsp."
 
 
 class HSC_CM01(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "If defined, use custom settings for the hsc_cm01 bsp."
 
 
 class M5484FIREENGINE(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "If defined, use custom settings for the m5484fireengine bsp."
 
 
 class mpc8240(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Defined for boards with mpc8240 -- undefined for others"
 
 
 class MPC8313ERDB(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "If defined, use custom settings for the mpc8313erdb bsp."
 
 
 class MPC8349(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "If defined, use custom settings for the mpc8349 libcpu family."
 
 
 class MPC8349EAMDS(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "If defined, use custom settings for the mpc8349eamds bsp."
 
 
 class mvme167(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Defined for mvme167 -- undefined for others"
 
 
 class mvme2100(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Defined for mvme2100 -- undefined for others"
 
 
 class PGH360(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "If defined, use custom settings for the pgh360 bsp."
 
 
 class qemu(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Defined for qemu bsp -- undefined for others"
 
 
 class MPC5200_BOARD_BRS5L(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Enable settings for powerpc MPC5200 BRS5L"
 
 class MPC5200_BOARD_BRS6L(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Enable settings for powerpc MPC5200 BRS6l"
 
 class MPC5200_BOARD_DP2(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Enable settings for powerpc MPC5200 dp2"
 
 class MPC5200_BOARD_ICECUBE(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Enable settings for powerpc MPC5200 icecube"
 
 class MPC5200_BOARD_PM520_CR825(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Enable settings for powerpc MPC5200 PM520_CR825"
 
 class MPC5200_BOARD_PM520_ZE30(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Enable settings for powerpc MPC5200 pm520"
 
@@ -2095,13 +2095,13 @@ class MPC5200_BOARD_PM520_ZE30(Boolean):
 # RTEMS internal options.
 class USE_CLANG(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Use Clang compiler."
 
 class USE_GCC(Boolean):
 	value	= True
-	tag   = [""]
+	tag   = ["build"]
 	undef	= True
 	descr	= "Use GCC compiler.."
 
@@ -2113,159 +2113,159 @@ class USE_GCC(Boolean):
 
 class LPC24XX_PCLKDIV(String):
 	value = "1U"
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "clock divider for default PCLK (PCLK = CCLK / PCLKDIV)"
 
 
 class LPC24XX_EMCCLKDIV(String):
 	value = "2U"
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "clock divider for EMCCLK (EMCCLK = CCLK / EMCCLKDIV)"
 
 
 class LPC24XX_EMC_MT48LC4M16A2(Boolean):
 	value = False
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "enable Micron MT48LC4M16A2 configuration for EMC"
 
 
 class LPC24XX_EMC_W9825G2JB75I(Boolean):
 	value = True
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "enable Winbond W9825G2JB75I configuration for EMC"
 
 
 class LPC24XX_EMC_IS42S32800D7(Boolean):
 	value = True
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "enable ISSI IS42S32800D7 configuration for EMC"
 
 
 class LPC24XX_EMC_IS42S32800B(Boolean):
 	value = True
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "enable ISSI IS42S32800B configuration for EMC"
 
 
 class LPC24XX_EMC_M29W160E(Boolean):
 	value = True
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "enable M29W160E configuration for EMC"
 
 
 class LPC24XX_EMC_M29W320E70(Boolean):
 	value = False
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "enable M29W320E70 configuration for EMC"
 
 
 class LPC24XX_EMC_SST39VF3201(Boolean):
 	value = True
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "enable SST39VF3201 configuration for EMC"
 
 
 class LPC_DMA_CHANNEL_COUNT(Integer):
 	value = 2
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "DMA channel count"
 
 
 class BSP_USB_OTG_TRANSCEIVER_I2C_ADDR(String):
 	value = ""
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "USB OTG transceiver I2C address used by USB stack"
 
 
 class MPC55XX_CHIP_FAMILY(String):
 	value = "(MPC55XX_CHIP_TYPE / 10)"
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "specifies the chip family in use (e.g. 555 for MPC5554)"
 
 
 class SMSC9218I_EDMA_RX_CHANNEL(Integer):
 	value = 49
-	tag   = [""]
+	tag   = ["network"]
 	undef = True
 	descr = "receive eDMA channel for SMSC9218I network interface"
 
 class SMSC9218I_EDMA_TX_CHANNEL(Integer):
 	value = 48
-	tag   = [""]
+	tag   = ["network"]
 	undef = True
 	descr = "transmit eDMA channel for SMSC9218I network interface"
 
 
 class SMSC9218I_BIG_ENDIAN_SUPPORT(Boolean):
 	value = True
-	tag   = [""]
+	tag   = ["network"]
 	undef = True
 	descr = "enable big endian support for SMSC9218I network interface"
 
 
 class SMSC9218I_ENABLE_LED_OUTPUTS(Boolean):
 	value = True
-	tag   = [""]
+	tag   = ["network"]
 	undef = True
 	descr = "enable LED outputs for SMSC9218I network interface"
 
 
 class SMSC9218I_RESET_PIN(Integer):
 	value = 186
-	tag   = [""]
+	tag   = ["network"]
 	undef = True
 	descr = "reset pin for SMSC9218I network interface"
 
 
 class SMSC9218I_IRQ_PIN(Integer):
 	value = 193
-	tag   = [""]
+	tag   = ["network"]
 	undef = True
 	descr = "IRQ pin for SMSC9218I network interface"
 
 
 class MPC55XX_SYSTEM_CLOCK_DIVIDER(Integer):
 	value = 1
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "system clock divider"
 
 
 class MPC55XX_REFERENCE_CLOCK(Integer):
 	value = 8000000
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "Must be defined to be the external reference clock (in Hz) for clock generation"
 
 
 class MPC55XX_SYSTEM_CLOCK(Integer):
 	value = 8000000
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "The system clock frequency in Hz."
 
 
 class MPC55XX_FMPLL_ESYNCR1_CLKCFG(Integer):
 	value = 7
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "the FMPLL ESYNCR1[CLKCFG] value"
 
 class MPC83XX_BOARD_HSC_CM01(Boolean):
 	value = True
-	tag   = [""]
+	tag   = ["build"]
 	undef = True
 	descr = "if defined, then use settings for the HSC_CM01 board"
 
@@ -2276,98 +2276,98 @@ class MPC83XX_BOARD_HSC_CM01(Boolean):
 
 class LM3S69XX_ENABLE_UART_0(Boolean):
 	value = True
-	tag   = [""]
+	tag   = ["network"]
 	undef = True
 	descr = "enable UART 0"
 
 
 class LM3S69XX_ENABLE_UART_1(Boolean):
 	value = True
-	tag   = [""]
+	tag   = ["network"]
 	undef = True
 	descr = "enable UART 1"
 
 
 class LM3S69XX_ENABLE_UART_2(Boolean):
 	value = True
-	tag   = [""]
+	tag   = ["network"]
 	undef = True
 	descr = "enable UART 2"
 
 
 class LM3S69XX_HAS_UDMA(Boolean):
 	value = False
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "defined if MCU supports UDMA"
 
 
 class LM3S69XX_MCU_LM3S3749(Boolean):
 	value = False
-	tag   = [""]
+	tag   = ["build"]
 	undef = True
 	descr = "board has LM3S3749 MCU"
 
 
 class LM3S69XX_MCU_LM3S6965(Boolean):
 	value = False
-	tag   = [""]
+	tag   = ["build"]
 	undef = True
 	descr = "board has LM3S6965 MCU"
 
 
 class LM3S69XX_NUM_GPIO_BLOCKS(Integer):
 	value = 1
-	tag   = [""]
+	tag   = ["build"]
 	undef = True
 	descr = "number of GPIO blocks supported by MCU"
 
 
 class LM3S69XX_NUM_SSI_BLOCKS(Integer):
 	value = 1
-	tag   = [""]
+	tag   = ["build"]
 	undef = True
 	descr = "number of SSI blocks supported by MCU"
 
 
 class LM3S69XX_SSI_CLOCK(String):
 	value = "1000000U"
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "SSI clock in Hz"
 
 
 class LM3S69XX_SYSTEM_CLOCK(String):
 	value = "50000000U"
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "system clock in Hz"
 
 
 class LM3S69XX_UART_BAUD(String):
 	value = "115200U"
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "baud for UARTs"
 
 
 class LM3S69XX_USE_AHB_FOR_GPIO(Boolean):
 	value = False
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "use AHB apperture to access GPIO registers"
 
 
 class LM3S69XX_XTAL_CONFIG(String):
 	value = "0x10"
-	tag   = [""]
+	tag   = ["build"]
 	undef = True
 	descr = "crystal configuration for RCC register"
 
 
 class BSP_ARM_A9MPCORE_PERIPHCLK(String):
 	value = "100000000U"
-	tag   = [""]
+	tag   = ["build"]
 	undef = True
 	descr = "ARM Cortex-A9 MPCore PERIPHCLK clock frequency in Hz"
 
@@ -2375,7 +2375,7 @@ class BSP_ARM_A9MPCORE_PERIPHCLK(String):
 
 class STM32F4_HSE_OSCILLATOR(Integer):
 	value = 8000000
-	tag   = [""]
+	tag   = ["build"]
 	undef = True
 	descr = "HSE oscillator frequency in Hz"
 
@@ -2383,7 +2383,7 @@ class STM32F4_HSE_OSCILLATOR(Integer):
 
 class STM32F4_SYSCLK(Integer):
 	value = 16000000
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "SYSCLK frequency in Hz"
 
@@ -2391,7 +2391,7 @@ class STM32F4_SYSCLK(Integer):
 
 class STM32F4_HCLK(Integer):
 	value = 16000000
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "HCLK frequency in Hz"
 
@@ -2399,7 +2399,7 @@ class STM32F4_HCLK(Integer):
 
 class STM32F4_PCLK1(Integer):
 	value = 16000000
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "PCLK1 frequency in Hz"
 
@@ -2407,7 +2407,7 @@ class STM32F4_PCLK1(Integer):
 
 class STM32F4_PCLK2(Integer):
 	value = 16000000
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "PCLK2 frequency in Hz"
 
@@ -2415,7 +2415,7 @@ class STM32F4_PCLK2(Integer):
 
 class STM32F4_USART_BAUD(Integer):
 	value = 115200
-	tag   = [""]
+	tag   = ["network"]
 	undef = True
 	descr = "baud for USARTs"
 
@@ -2423,56 +2423,56 @@ class STM32F4_USART_BAUD(Integer):
 
 class STM32F4_ENABLE_USART_1(Boolean):
 	value = False
-	tag   = [""]
+	tag   = ["network"]
 	undef = True
 	descr = "enable USART 1"
 
 
 class STM32F4_ENABLE_USART_2(Boolean):
 	value = False
-	tag   = [""]
+	tag   = ["network"]
 	undef = True
 	descr = "enable USART 2"
 
 
 class STM32F4_ENABLE_USART_3(Boolean):
 	value = True
-	tag   = [""]
+	tag   = ["network"]
 	undef = True
 	descr = "enable USART 3"
 
 
 class STM32F4_ENABLE_UART_4(Boolean):
 	value = False
-	tag   = [""]
+	tag   = ["network"]
 	undef = True
 	descr = "enable UART 4"
 
 
 class STM32F4_ENABLE_UART_5(Boolean):
 	value = False
-	tag   = [""]
+	tag   = ["network"]
 	undef = True
 	descr = "enable UART 5"
 
 
 class STM32F4_ENABLE_USART_6(Boolean):
 	value = False
-	tag   = [""]
+	tag   = ["network"]
 	undef = True
 	descr = "enable USART 6"
 
 
 class MPC83XX_BOARD_BR_UID(Boolean):
 	value = True
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "if defined, then use settings for the BR UID board"
 
 
 class MPC83XX_NETWORK_INTERFACE_0_PHY_ADDR(String):
 	value = "0x11"
-	tag   = [""]
+	tag   = ["build"]
 	undef = True
 	quote = False
 	descr = "PHY address of network interface 0"
@@ -2480,14 +2480,14 @@ class MPC83XX_NETWORK_INTERFACE_0_PHY_ADDR(String):
 
 class MPC83XX_CHIP_TYPE(Integer):
 	value = 0
-	tag   = [""]
+	tag   = ["build"]
 	undef = True
 	descr = "chip type of the MPC83XX family"
 
 
 class MPC83XX_HAS_NAND_LP_FLASH_ON_CS0(Boolean):
 	value = True
-	tag   = [""]
+	tag   = ["build"]
 	undef = True
 	descr = "indicates if the board has a NAND large page flash on chip select 0"
 
@@ -2496,11 +2496,11 @@ class BSP_INTERRUPT_HANDLER_TABLE_SIZE(Integer):
 	no_default = True
 	undef = True
 	descr = "defines the maximum number of interrupt handlers"
-
+	tag   = ["general"]
 
 class MPC55XX_NULL_POINTER_PROTECTION(Boolean):
 	value = True
-	tag   = [""]
+	tag   = ["build"]
 	undef = True
 	descr = "enable NULL pointer protection"
 
@@ -2509,11 +2509,11 @@ class MPC55XX_CLOCK_PIT_CHANNEL(Integer):
 	no_default = True
 	undef = True
 	descr = "selects the PIT channel for the RTEMS system tick (the default is the last channel"
-
+	tag   = ["build"]
 
 class MPC55XX_NEEDS_LOW_LEVEL_INIT(Boolean):
 	value = True
-	tag   = [""]
+	tag   = ["build"]
 	undef = True
 	descr = "if defined, do low level initialization"
 
@@ -2522,25 +2522,25 @@ class BSP_DATA_CACHE_USE_WRITE_THROUGH(Boolean):
 	no_default = True
 	undef = True
 	descr = "use write-through for data cache"
-
+	tag   = ["storage"]
 
 class MPC55XX_BOARD_MPC5674F_ECU508(Boolean):
 	value = True
-	tag   = [""]
+	tag   = ["build"]
 	undef = True
 	descr = "if defined, use custom settings for ECU508 board"
 
 
 class MPC55XX_CONSOLE_MINOR(Integer):
 	value = 0
-	tag   = [""]
+	tag   = ["build"]
 	undef = True
 	descr = "determines which serial device will be registered as /dev/console"
 
 
 class MPC55XX_BOARD_MPC5674F_RSM6(Boolean):
 	value = True
-	tag   = [""]
+	tag   = ["build"]
 	quote = False
 	undef = True
 	descr = "if defined, use custom settings for RSM6 board"
@@ -2548,110 +2548,110 @@ class MPC55XX_BOARD_MPC5674F_RSM6(Boolean):
 
 class MPC55XX_ENABLE_START_PROLOGUE(Boolean):
 	value = True
-	tag   = [""]
+	tag   = ["build"]
 	undef = True
 	descr = "if defined, enable start prologue"
 
 
 class BSP_DEFAULT_BAUD_RATE(Integer):
 	value = 115200
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "default console baud"
 
 
 class MPC55XX_EARLY_STACK_SIZE(Integer):
 	value = 1024
-	tag   = [""]
+	tag   = ["build"]
 	undef = True
 	descr = "size of the early initialization stack in bytes"
 
 class MPC83XX_BOARD_MPC8309SOM(Boolean):
 	value = True
-	tag   = [""]
+	tag   = ["build"]
 	undef = True
 	descr = "if defined, then use settings for the MPC8309SOM board"
 
 
 class ZYNQ_RAM_ORIGIN(String):
 	value = "0x00400000"
-	tag   = [""]
+	tag   = ["storage"]
 	undef = True
 	descr = "Normal RAM region origin"
 
 class ZYNQ_RAM_MMU(String):
 	value = "%(ZYNQ_RAM_ORIGIN)s"
-	tag   = [""]
+	tag   = ["storage"]
 	quote = False
 	undef = True
 	descr = "MMU region origin"
 
 class ZYNQ_RAM_MMU_LENGTH(String):
 	value = "16k"
-	tag   = [""]
+	tag   = ["storage"]
 	undef = True
 	descr = "MMU region length"
 
 class ZYNQ_RAM_ORIGIN_AVAILABLE(String):
 	value = "%(ZYNQ_RAM_ORIGIN)s + 0x00004000"
-	tag   = [""]
+	tag   = ["storage"]
 	undef = True
 	descr = "Origin of available RAM"
 
 class ZYNQ_RAM_LENGTH_AVAILABLE(String):
 	value = "%(BSP_ZYNQ_RAM_LENGTH)s - 1M - 16k"
-	tag   = [""]
+	tag   = ["storage"]
 	undef = True
 	descr = "Length of available RAM"
 
 class ZYNQ_RAM_INT_0_ORIGIN(String):
 	value = "0x00000000"
-	tag   = [""]
+	tag   = ["storage"]
 	undef = True
 	descr = "Internal 0 RAM region origin"
 
 class ZYNQ_RAM_INT_0_LENGTH(String):
 	value = "64k + 64k + 64k"
-	tag   = [""]
+	tag   = ["storage"]
 	undef = True
 	descr = "Internal 0 RAM region length"
 
 class ZYNQ_RAM_INT_1_ORIGIN(String):
 	value = "0xFFFF0000"
-	tag   = [""]
+	tag   = ["storage"]
 	undef = True
 	descr = "Internal 1 RAM region origin"
 
 class ZYNQ_RAM_INT_1_LENGTH(String):
 	value = "64k - 512"
-	tag   = [""]
+	tag   = ["storage"]
 	undef = True
 	descr = "Internal 1 RAM region length"
 
 class BSP_ZYNQ_RAM_LENGTH(String):
 	value = "256M"
-	tag   = [""]
+	tag   = ["storage"]
 	quote = False
 	undef = True
 	descr = "Override a BSP's default RAM length"
 
 class ZYNQ_RAM_NOCACHE_LENGTH(String):
 	value = "1M"
-	tag   = [""]
+	tag   = ["storage"]
 	quote = False
 	undef = True
 	descr = "Length of nocache RAM region"
 
 class ZYNQ_CLOCK_CPU_1X(String):
 	value = "111111111U"
-	tag   = [""]
+	tag   = ["general"]
 	quote = False
 	undef = True
 	descr = "Zynq cpu_1x clock frequency in Hz"
 
 class ZYNQ_CLOCK_UART(String):
 	value = "50000000UL"
-	tag   = [""]
+	tag   = ["network"]
 	quote = False
 	undef = True
 	descr = "Zynq UART clock frequency in Hz"
@@ -2659,7 +2659,7 @@ class ZYNQ_CLOCK_UART(String):
 
 class ZYNQ_CPUS(Integer):
 	value = 1
-	tag   = [""]
+	tag   = ["general"]
 	quote = False
 	undef = True
 	descr = "Number of active cores"
@@ -2667,34 +2667,34 @@ class ZYNQ_CPUS(Integer):
 
 class IS_DM3730(Boolean):
 	value = False
-	tag   = [""]
+	tag   = ["build"]
 	undef = True
 	descr = "true if SOC is DM3730"
 
 
 class IS_AM335X(Boolean):
 	value = False
-	tag   = [""]
+	tag   = ["build"]
 	undef = True
 	descr = "true if SOC is AM335X"
 
 
 class CONSOLE_POLLED(Boolean):
 	value = False
-	tag   = [""]
+	tag   = ["general"]
 	undef = True
 	descr = "Polled console i/o."
 
 
 class CONSOLE_BAUD(Integer):
 	value = 115200
-	tag   = [""]
+	tag   = ["network"]
 	undef = True
 	descr = "initial baud for console UART"
 
 
 class ENABLE_SYSTEM_DEP(Boolean):
 	value	= False
-	tag   = [""]
+	tag   = ["general"]
 	undef	= True
 	descr	= "Enable dependencies on system headers, only useful if you are developing toolchains.  This will slow down the build"