Index: c/src/lib/libbsp/arm/beagle/configure.ac
===================================================================
--- c/src/lib/libbsp/arm/beagle/configure.ac	(revision 7a669866eea8b66b87b22015b793b5ea4ff950c1)
+++ c/src/lib/libbsp/arm/beagle/configure.ac	(revision 53dd6d6130c870d12351d8ca75e4ac9dcc834c86)
@@ -19,76 +19,15 @@
 RTEMS_PROG_CCAS
 
-RTEMS_CHECK_NETWORKING
-AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
+RTEMS_BSPOPTS_SET([IS_DM3730],[beagleboard*],[1])
+RTEMS_BSPOPTS_HELP([IS_DM3730],[true if SOC is DM3730])
 
-RTEMS_BSPOPTS_SET([BSP_SMALL_MEMORY],[beagle_mzx_stage_1],[1])
-RTEMS_BSPOPTS_SET([BSP_SMALL_MEMORY],[*],[])
-RTEMS_BSPOPTS_HELP([BSP_SMALL_MEMORY],[disable testsuite samples with high memory demands])
+RTEMS_BSPOPTS_SET([IS_AM335X],[beaglebone*],[1])
+RTEMS_BSPOPTS_HELP([IS_AM335X],[true if SOC is AM335X])
 
-RTEMS_BSPOPTS_SET([BEAGLE_OSCILLATOR_MAIN],[*],[13000000U])
-RTEMS_BSPOPTS_HELP([BEAGLE_OSCILLATOR_MAIN],[main oscillator frequency in Hz])
+RTEMS_BSPOPTS_SET([CONSOLE_BAUD],[*],[115200])
+RTEMS_BSPOPTS_HELP([CONSOLE_BAUD],[initial baud for console UART])
 
-RTEMS_BSPOPTS_SET([BEAGLE_OSCILLATOR_RTC],[*],[32768U])
-RTEMS_BSPOPTS_HELP([BEAGLE_OSCILLATOR_RTC],[RTC oscillator frequency in Hz])
-
-RTEMS_BSPOPTS_SET([BEAGLE_PERIPH_CLK],[*],[13000000U])
-RTEMS_BSPOPTS_HELP([BEAGLE_PERIPH_CLK],[peripheral clock in Hz])
-
-RTEMS_BSPOPTS_SET([BEAGLE_ETHERNET_RMII],[*],[1])
-RTEMS_BSPOPTS_HELP([BEAGLE_ETHERNET_RMII],[enable RMII for Ethernet])
-
-RTEMS_BSPOPTS_SET([BEAGLE_UART_1_BAUD],[*],[])
-RTEMS_BSPOPTS_HELP([BEAGLE_UART_1_BAUD],[baud for UART 1])
-
-RTEMS_BSPOPTS_SET([BEAGLE_UART_2_BAUD],[*],[])
-RTEMS_BSPOPTS_HELP([BEAGLE_UART_2_BAUD],[baud for UART 2])
-
-RTEMS_BSPOPTS_SET([BEAGLE_UART_7_BAUD],[*],[])
-RTEMS_BSPOPTS_HELP([BEAGLE_UART_7_BAUD],[baud for UART 7])
-
-RTEMS_BSPOPTS_SET([BEAGLE_CONFIG_U3CLK],[*],[])
-RTEMS_BSPOPTS_HELP([BEAGLE_CONFIG_U3CLK],[clock configuration for UART 3])
-
-RTEMS_BSPOPTS_SET([BEAGLE_CONFIG_U4CLK],[*],[])
-RTEMS_BSPOPTS_HELP([BEAGLE_CONFIG_U4CLK],[clock configuration for UART 4])
-
-RTEMS_BSPOPTS_SET([BEAGLE_CONFIG_U5CLK],[*],[0x00001386U])
-RTEMS_BSPOPTS_HELP([BEAGLE_CONFIG_U5CLK],[clock configuration for UART 5])
-
-RTEMS_BSPOPTS_SET([BEAGLE_CONFIG_U6CLK],[*],[])
-RTEMS_BSPOPTS_HELP([BEAGLE_CONFIG_U6CLK],[clock configuration for UART 6])
-
-RTEMS_BSPOPTS_SET([BEAGLE_CONFIG_UART_CLKMODE],[*],[0x00000200U])
-RTEMS_BSPOPTS_HELP([BEAGLE_CONFIG_UART_CLKMODE],[clock mode configuration for UARTs])
-
-RTEMS_BSPOPTS_SET([BEAGLE_DISABLE_MMU],[*],[])
-RTEMS_BSPOPTS_HELP([BEAGLE_DISABLE_MMU],[disable MMU])
-
-RTEMS_BSPOPTS_SET([BEAGLE_DISABLE_READ_WRITE_DATA_CACHE],[*],[])
-RTEMS_BSPOPTS_HELP([BEAGLE_DISABLE_READ_WRITE_DATA_CACHE],[disable cache for read-write data sections])
-
-RTEMS_BSPOPTS_SET([BEAGLE_DISABLE_READ_ONLY_PROTECTION],[*],[])
-RTEMS_BSPOPTS_HELP([BEAGLE_DISABLE_READ_ONLY_PROTECTION],[disable MMU protection of read-only sections])
-
-RTEMS_BSPOPTS_SET([BEAGLE_SCRATCH_AREA_SIZE],[beagle_mzx*],[4096])
-RTEMS_BSPOPTS_HELP([BEAGLE_SCRATCH_AREA_SIZE],[size of scratch area])
-
-RTEMS_BSPOPTS_SET([BEAGLE_STOP_GPDMA],[*],[1])
-RTEMS_BSPOPTS_HELP([BEAGLE_STOP_GPDMA],[stop general purpose DMA at start-up to avoid DMA interference])
-
-RTEMS_BSPOPTS_SET([BEAGLE_STOP_ETHERNET],[*],[1])
-RTEMS_BSPOPTS_HELP([BEAGLE_STOP_ETHERNET],[stop Ethernet controller at start-up to avoid DMA interference])
-
-RTEMS_BSPOPTS_SET([BEAGLE_STOP_USB],[*],[1])
-RTEMS_BSPOPTS_HELP([BEAGLE_STOP_USB],[stop USB controller at start-up to avoid DMA interference])
-
-RTEMS_BSPOPTS_SET([BEAGLE_ENABLE_WATCHDOG_RESET],[*],[1])
-RTEMS_BSPOPTS_HELP([BEAGLE_ENABLE_WATCHDOG_RESET],[bsp_reset() will use the watchdog to reset the chip])
-
-RTEMS_BSPOPTS_SET([BSP_START_RESET_VECTOR],[*],[])
-RTEMS_BSPOPTS_HELP([BSP_START_RESET_VECTOR],[reset vector address for BSP start])
-
-RTEMS_BSPOPTS_SET([TESTS_USE_PRINTK],[*],[1])
-RTEMS_BSPOPTS_HELP([TESTS_USE_PRINTK],[tests use printk() for output])
+RTEMS_BSPOPTS_SET([CONSOLE_POLLED],[*],[0])
+RTEMS_BSPOPTS_HELP([CONSOLE_POLLED],[polled console i/o (e.g. to run testsuite)])
 
 RTEMS_BSP_CLEANUP_OPTIONS(0, 0)
