diff options
| author | Nathan Rossi <nathan.rossi@xilinx.com> | 2013-07-30 17:36:13 +1000 |
|---|---|---|
| committer | Nathan Rossi <nathan.rossi@xilinx.com> | 2013-07-30 17:36:13 +1000 |
| commit | ec0e617e44ea367a77f139b92f93ed2d1392de06 (patch) | |
| tree | a29d327f9566c1b0127aa3a27a90ef245f62c295 /conf/machine/boards/common | |
| parent | 39da72a7df5d09a1d1d015b9966454da88ad1764 (diff) | |
| download | meta-xilinx-ec0e617e44ea367a77f139b92f93ed2d1392de06.tar.gz | |
linux-xlnx: Clean up Zynq defconfig use
* Remove qemuzynq.cfg and rename zynq common defconfig's
* Use default inclusion of the zynq default defconfig
* Make rtc.cfg general for multiple kernels
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
Diffstat (limited to 'conf/machine/boards/common')
| -rw-r--r-- | conf/machine/boards/common/nortc.cfg | 78 | ||||
| -rw-r--r-- | conf/machine/boards/common/rtc.cfg | 15 | ||||
| -rw-r--r-- | conf/machine/boards/common/rtc_3.6.cfg | 76 | ||||
| -rw-r--r-- | conf/machine/boards/common/rtc_3.8.cfg | 78 | ||||
| -rw-r--r-- | conf/machine/boards/common/zynq_defconfig_3.6.cfg (renamed from conf/machine/boards/common/xilinx_zynq_defconfig_3.6.cfg) | 0 | ||||
| -rw-r--r-- | conf/machine/boards/common/zynq_defconfig_3.8.cfg (renamed from conf/machine/boards/common/xilinx_zynq_defconfig_3.8.cfg) | 0 |
6 files changed, 15 insertions, 232 deletions
diff --git a/conf/machine/boards/common/nortc.cfg b/conf/machine/boards/common/nortc.cfg deleted file mode 100644 index b67c7a43..00000000 --- a/conf/machine/boards/common/nortc.cfg +++ /dev/null | |||
| @@ -1,78 +0,0 @@ | |||
| 1 | # Disable the RTC | ||
| 2 | |||
| 3 | # CONFIG_RTC_LIB is not set | ||
| 4 | # CONFIG_RTC_CLASS is not set | ||
| 5 | # CONFIG_RTC_HCTOSYS is not set | ||
| 6 | # CONFIG_RTC_HCTOSYS_DEVICE is not set | ||
| 7 | # CONFIG_RTC_DEBUG is not set | ||
| 8 | |||
| 9 | # | ||
| 10 | # RTC interfaces | ||
| 11 | # | ||
| 12 | # CONFIG_RTC_INTF_SYSFS is not set | ||
| 13 | # CONFIG_RTC_INTF_PROC is not set | ||
| 14 | # CONFIG_RTC_INTF_DEV is not set | ||
| 15 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 16 | # CONFIG_RTC_DRV_TEST is not set | ||
| 17 | |||
| 18 | # | ||
| 19 | # I2C RTC drivers | ||
| 20 | # | ||
| 21 | # CONFIG_RTC_DRV_DS1307 is not set | ||
| 22 | # CONFIG_RTC_DRV_DS1374 is not set | ||
| 23 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 24 | # CONFIG_RTC_DRV_DS3232 is not set | ||
| 25 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 26 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 27 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 28 | # CONFIG_RTC_DRV_ISL12022 is not set | ||
| 29 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 30 | # CONFIG_RTC_DRV_PCF8523 is not set | ||
| 31 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 32 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 33 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 34 | # CONFIG_RTC_DRV_BQ32K is not set | ||
| 35 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 36 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 37 | # CONFIG_RTC_DRV_RX8581 is not set | ||
| 38 | # CONFIG_RTC_DRV_RX8025 is not set | ||
| 39 | # CONFIG_RTC_DRV_EM3027 is not set | ||
| 40 | # CONFIG_RTC_DRV_RV3029C2 is not set | ||
| 41 | |||
| 42 | # | ||
| 43 | # SPI RTC drivers | ||
| 44 | # | ||
| 45 | # CONFIG_RTC_DRV_M41T93 is not set | ||
| 46 | # CONFIG_RTC_DRV_M41T94 is not set | ||
| 47 | # CONFIG_RTC_DRV_DS1305 is not set | ||
| 48 | # CONFIG_RTC_DRV_DS1390 is not set | ||
| 49 | # CONFIG_RTC_DRV_MAX6902 is not set | ||
| 50 | # CONFIG_RTC_DRV_R9701 is not set | ||
| 51 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
| 52 | # CONFIG_RTC_DRV_DS3234 is not set | ||
| 53 | # CONFIG_RTC_DRV_PCF2123 is not set | ||
| 54 | |||
| 55 | # | ||
| 56 | # Platform RTC drivers | ||
| 57 | # | ||
| 58 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 59 | # CONFIG_RTC_DRV_DS1286 is not set | ||
| 60 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 61 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 62 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 63 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 64 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 65 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 66 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 67 | # CONFIG_RTC_DRV_MSM6242 is not set | ||
| 68 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 69 | # CONFIG_RTC_DRV_RP5C01 is not set | ||
| 70 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 71 | # CONFIG_RTC_DRV_DS2404 is not set | ||
| 72 | |||
| 73 | # | ||
| 74 | # on-CPU RTC drivers | ||
| 75 | # | ||
| 76 | # CONFIG_RTC_DRV_PL030 is not set | ||
| 77 | # CONFIG_RTC_DRV_PL031 is not set | ||
| 78 | # CONFIG_RTC_DRV_SNVS is not set | ||
diff --git a/conf/machine/boards/common/rtc.cfg b/conf/machine/boards/common/rtc.cfg new file mode 100644 index 00000000..ac838f1d --- /dev/null +++ b/conf/machine/boards/common/rtc.cfg | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | # Enable the RTC | ||
| 2 | |||
| 3 | CONFIG_RTC_LIB=y | ||
| 4 | CONFIG_RTC_CLASS=y | ||
| 5 | CONFIG_RTC_HCTOSYS=y | ||
| 6 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 7 | |||
| 8 | # | ||
| 9 | # RTC interfaces | ||
| 10 | # | ||
| 11 | CONFIG_RTC_INTF_SYSFS=y | ||
| 12 | CONFIG_RTC_INTF_PROC=y | ||
| 13 | CONFIG_RTC_INTF_DEV=y | ||
| 14 | |||
| 15 | CONFIG_RTC_DRV_PCF8563=y \ No newline at end of file | ||
diff --git a/conf/machine/boards/common/rtc_3.6.cfg b/conf/machine/boards/common/rtc_3.6.cfg deleted file mode 100644 index 78dfaf17..00000000 --- a/conf/machine/boards/common/rtc_3.6.cfg +++ /dev/null | |||
| @@ -1,76 +0,0 @@ | |||
| 1 | # Enable the RTC | ||
| 2 | |||
| 3 | CONFIG_RTC_LIB=y | ||
| 4 | CONFIG_RTC_CLASS=y | ||
| 5 | CONFIG_RTC_HCTOSYS=y | ||
| 6 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 7 | # CONFIG_RTC_DEBUG is not set | ||
| 8 | |||
| 9 | # | ||
| 10 | # RTC interfaces | ||
| 11 | # | ||
| 12 | CONFIG_RTC_INTF_SYSFS=y | ||
| 13 | CONFIG_RTC_INTF_PROC=y | ||
| 14 | CONFIG_RTC_INTF_DEV=y | ||
| 15 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 16 | # CONFIG_RTC_DRV_TEST is not set | ||
| 17 | |||
| 18 | # | ||
| 19 | # I2C RTC drivers | ||
| 20 | # | ||
| 21 | # CONFIG_RTC_DRV_DS1307 is not set | ||
| 22 | # CONFIG_RTC_DRV_DS1374 is not set | ||
| 23 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 24 | # CONFIG_RTC_DRV_DS3232 is not set | ||
| 25 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 26 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 27 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 28 | # CONFIG_RTC_DRV_ISL12022 is not set | ||
| 29 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 30 | CONFIG_RTC_DRV_PCF8563=y | ||
| 31 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 32 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 33 | # CONFIG_RTC_DRV_BQ32K is not set | ||
| 34 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 35 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 36 | # CONFIG_RTC_DRV_RX8581 is not set | ||
| 37 | # CONFIG_RTC_DRV_RX8025 is not set | ||
| 38 | # CONFIG_RTC_DRV_EM3027 is not set | ||
| 39 | # CONFIG_RTC_DRV_RV3029C2 is not set | ||
| 40 | |||
| 41 | # | ||
| 42 | # SPI RTC drivers | ||
| 43 | # | ||
| 44 | # CONFIG_RTC_DRV_M41T93 is not set | ||
| 45 | # CONFIG_RTC_DRV_M41T94 is not set | ||
| 46 | # CONFIG_RTC_DRV_DS1305 is not set | ||
| 47 | # CONFIG_RTC_DRV_DS1390 is not set | ||
| 48 | # CONFIG_RTC_DRV_MAX6902 is not set | ||
| 49 | # CONFIG_RTC_DRV_R9701 is not set | ||
| 50 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
| 51 | # CONFIG_RTC_DRV_DS3234 is not set | ||
| 52 | # CONFIG_RTC_DRV_PCF2123 is not set | ||
| 53 | |||
| 54 | # | ||
| 55 | # Platform RTC drivers | ||
| 56 | # | ||
| 57 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 58 | # CONFIG_RTC_DRV_DS1286 is not set | ||
| 59 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 60 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 61 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 62 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 63 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 64 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 65 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 66 | # CONFIG_RTC_DRV_MSM6242 is not set | ||
| 67 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 68 | # CONFIG_RTC_DRV_RP5C01 is not set | ||
| 69 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 70 | |||
| 71 | # | ||
| 72 | # on-CPU RTC drivers | ||
| 73 | # | ||
| 74 | # CONFIG_RTC_DRV_PL030 is not set | ||
| 75 | # CONFIG_RTC_DRV_PL031 is not set | ||
| 76 | |||
diff --git a/conf/machine/boards/common/rtc_3.8.cfg b/conf/machine/boards/common/rtc_3.8.cfg deleted file mode 100644 index f584f793..00000000 --- a/conf/machine/boards/common/rtc_3.8.cfg +++ /dev/null | |||
| @@ -1,78 +0,0 @@ | |||
| 1 | # Enable the RTC | ||
| 2 | |||
| 3 | CONFIG_RTC_LIB=y | ||
| 4 | CONFIG_RTC_CLASS=y | ||
| 5 | CONFIG_RTC_HCTOSYS=y | ||
| 6 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 7 | # CONFIG_RTC_DEBUG is not set | ||
| 8 | |||
| 9 | # | ||
| 10 | # RTC interfaces | ||
| 11 | # | ||
| 12 | CONFIG_RTC_INTF_SYSFS=y | ||
| 13 | CONFIG_RTC_INTF_PROC=y | ||
| 14 | CONFIG_RTC_INTF_DEV=y | ||
| 15 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 16 | # CONFIG_RTC_DRV_TEST is not set | ||
| 17 | |||
| 18 | # | ||
| 19 | # I2C RTC drivers | ||
| 20 | # | ||
| 21 | # CONFIG_RTC_DRV_DS1307 is not set | ||
| 22 | # CONFIG_RTC_DRV_DS1374 is not set | ||
| 23 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 24 | # CONFIG_RTC_DRV_DS3232 is not set | ||
| 25 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 26 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 27 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 28 | # CONFIG_RTC_DRV_ISL12022 is not set | ||
| 29 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 30 | # CONFIG_RTC_DRV_PCF8523 is not set | ||
| 31 | CONFIG_RTC_DRV_PCF8563=y | ||
| 32 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 33 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 34 | # CONFIG_RTC_DRV_BQ32K is not set | ||
| 35 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 36 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 37 | # CONFIG_RTC_DRV_RX8581 is not set | ||
| 38 | # CONFIG_RTC_DRV_RX8025 is not set | ||
| 39 | # CONFIG_RTC_DRV_EM3027 is not set | ||
| 40 | # CONFIG_RTC_DRV_RV3029C2 is not set | ||
| 41 | |||
| 42 | # | ||
| 43 | # SPI RTC drivers | ||
| 44 | # | ||
| 45 | # CONFIG_RTC_DRV_M41T93 is not set | ||
| 46 | # CONFIG_RTC_DRV_M41T94 is not set | ||
| 47 | # CONFIG_RTC_DRV_DS1305 is not set | ||
| 48 | # CONFIG_RTC_DRV_DS1390 is not set | ||
| 49 | # CONFIG_RTC_DRV_MAX6902 is not set | ||
| 50 | # CONFIG_RTC_DRV_R9701 is not set | ||
| 51 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
| 52 | # CONFIG_RTC_DRV_DS3234 is not set | ||
| 53 | # CONFIG_RTC_DRV_PCF2123 is not set | ||
| 54 | |||
| 55 | # | ||
| 56 | # Platform RTC drivers | ||
| 57 | # | ||
| 58 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 59 | # CONFIG_RTC_DRV_DS1286 is not set | ||
| 60 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 61 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 62 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 63 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 64 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 65 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 66 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 67 | # CONFIG_RTC_DRV_MSM6242 is not set | ||
| 68 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 69 | # CONFIG_RTC_DRV_RP5C01 is not set | ||
| 70 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 71 | # CONFIG_RTC_DRV_DS2404 is not set | ||
| 72 | |||
| 73 | # | ||
| 74 | # on-CPU RTC drivers | ||
| 75 | # | ||
| 76 | # CONFIG_RTC_DRV_PL030 is not set | ||
| 77 | # CONFIG_RTC_DRV_PL031 is not set | ||
| 78 | # CONFIG_RTC_DRV_SNVS is not set \ No newline at end of file | ||
diff --git a/conf/machine/boards/common/xilinx_zynq_defconfig_3.6.cfg b/conf/machine/boards/common/zynq_defconfig_3.6.cfg index 9c11cdb1..9c11cdb1 100644 --- a/conf/machine/boards/common/xilinx_zynq_defconfig_3.6.cfg +++ b/conf/machine/boards/common/zynq_defconfig_3.6.cfg | |||
diff --git a/conf/machine/boards/common/xilinx_zynq_defconfig_3.8.cfg b/conf/machine/boards/common/zynq_defconfig_3.8.cfg index 997532dc..997532dc 100644 --- a/conf/machine/boards/common/xilinx_zynq_defconfig_3.8.cfg +++ b/conf/machine/boards/common/zynq_defconfig_3.8.cfg | |||
