There's a number of dangling comments in various tegra configs post migrations of various configs so lets clean them up.
Signed-off-by: Peter Robinson pbrobinson@gmail.com Cc: Tom Warren twarren@nvidia.com Cc: Stephen Warren swarren@nvidia.com Cc: Marcel Ziswiler marcel.ziswiler@toradex.com Cc: Tom Warren twarren@nvidia.com Cc: Stephen Warren swarren@nvidia.com Cc: Peter.Chubb@data61.csiro.au Cc: Lucas Stach dev@lynxeye.de Cc: Stefan Agner stefan.agner@toradex.com Cc: Alban Bedel alban.bedel@avionic-design.de Cc: Allen Martin amartin@nvidia.com --- include/configs/apalis-tk1.h | 2 -- include/configs/apalis_t30.h | 4 ---- include/configs/beaver.h | 6 ------ include/configs/cardhu.h | 6 ------ include/configs/cei-tk1-som.h | 6 ------ include/configs/colibri_t20.h | 6 ------ include/configs/colibri_t30.h | 2 -- include/configs/dalmore.h | 4 ---- include/configs/e2220-1170.h | 4 ---- include/configs/harmony.h | 4 ---- include/configs/jetson-tk1.h | 6 ------ include/configs/medcom-wide.h | 2 -- include/configs/nyan-big.h | 4 ---- include/configs/p2371-0000.h | 4 ---- include/configs/p2371-2180.h | 6 ------ include/configs/p2571.h | 4 ---- include/configs/p2771-0000.h | 2 -- include/configs/paz00.h | 2 -- include/configs/plutux.h | 4 ---- include/configs/seaboard.h | 2 -- include/configs/tec-ng.h | 4 ---- include/configs/tec.h | 2 -- include/configs/tegra-common.h | 6 ------ include/configs/tegra210-common.h | 4 ---- include/configs/tegra30-common.h | 4 ---- include/configs/trimslice.h | 6 ------ include/configs/venice2.h | 4 ---- include/configs/ventana.h | 2 -- 28 files changed, 112 deletions(-)
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 667d0846118..506a9e4f2fe 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -14,8 +14,6 @@
#define CONFIG_ARCH_MISC_INIT
-/* High-level configuration options */ - /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index 646086a9566..ac012225a77 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -12,8 +12,6 @@
#include "tegra30-common.h"
-/* High-level configuration options */ - /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE @@ -32,8 +30,6 @@ /* USB host support */ #define CONFIG_USB_EHCI_TEGRA
-/* PCI host support */ - /* PCI networking support */ #define CONFIG_E1000_NO_NVM
diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 73629ddeb00..8ea583ddfc4 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -39,12 +39,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - -/* PCI host support */ - -/* General networking support */ - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h"
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index dcb66a6f9a3..2ad93204443 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -43,12 +43,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - -/* PCI host support */ - -/* General networking support */ - #include "tegra-common-post.h"
#endif /* __CONFIG_H */ diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index 14008440dae..b595c482632 100644 --- a/include/configs/cei-tk1-som.h +++ b/include/configs/cei-tk1-som.h @@ -38,12 +38,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - -/* PCI host support */ - -/* General networking support */ - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h"
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 4a18c72a533..c34d6d055c3 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -10,8 +10,6 @@
#include "tegra20-common.h"
-/* High-level configuration options */ - /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_TEGRA_UARTA_SDIO1 @@ -26,8 +24,6 @@ #define CONFIG_USB_EHCI_TEGRA #define CONFIG_USB_MAX_CONTROLLER_COUNT 3
-/* USB networking support */ - /* General networking support */ #define CONFIG_IP_DEFRAG #define CONFIG_TFTP_BLOCKSIZE 1536 @@ -40,8 +36,6 @@ #define CONFIG_TEGRA_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1
-/* Dynamic MTD partition support */ - /* Environment in NAND, 64K is a bit excessive but erase block is 512K anyway */ #define CONFIG_ENV_OFFSET (SZ_2M) #undef CONFIG_ENV_SIZE /* undef size from tegra20-common.h */ diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index 908b3bde3e0..6b1a831da9a 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -32,8 +32,6 @@ /* USB host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - /* General networking support */ #define CONFIG_IP_DEFRAG #define CONFIG_TFTP_BLOCKSIZE 16352 diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index 9a8b5a73574..afd2dd2f64c 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -35,10 +35,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - -/* General networking support */ - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h"
diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h index dd7a01290ae..6fe2f667957 100644 --- a/include/configs/e2220-1170.h +++ b/include/configs/e2220-1170.h @@ -33,10 +33,6 @@ /* USB2.0 Host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - -/* General networking support */ - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h"
diff --git a/include/configs/harmony.h b/include/configs/harmony.h index fc5ed5b2fd8..7365dfeb46c 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -29,16 +29,12 @@ #define CONFIG_TEGRA_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1
-/* Dynamic MTD partition support */ - /* Environment in NAND (which is 512M), aligned to start of last sector */ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sector size */
/* USB Host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - #include "tegra-common-post.h"
#endif /* __CONFIG_H */ diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index 93fcdd6bcc5..192d821d4b2 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -34,12 +34,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - -/* PCI host support */ - -/* General networking support */ - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h"
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index b290df58915..88976fed64c 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -28,8 +28,6 @@ /* USB host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - #include "tegra-common-post.h"
#endif /* __CONFIG_H */ diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index dd76829e91a..4a0de707335 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -37,10 +37,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - -/* General networking support */ - #define CONFIG_KEYBOARD
#undef CONFIG_LOADADDR diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index 6654a1b4df8..9e22bbb8cf4 100644 --- a/include/configs/p2371-0000.h +++ b/include/configs/p2371-0000.h @@ -33,10 +33,6 @@ /* USB2.0 Host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - -/* General networking support */ - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h"
diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index 0e37511daf4..76c11ad7a0c 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -33,12 +33,6 @@ /* USB2.0 Host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - -/* PCI host support */ - -/* General networking support */ - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h"
diff --git a/include/configs/p2571.h b/include/configs/p2571.h index 1daf49a4535..5e34f22618f 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -34,10 +34,6 @@ /* USB2.0 Host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - -/* General networking support */ - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h"
diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h index cfe8d8cbede..e8be81a66cf 100644 --- a/include/configs/p2771-0000.h +++ b/include/configs/p2771-0000.h @@ -21,8 +21,6 @@ #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
-/* PCI host support */ - #define BOARD_EXTRA_ENV_SETTINGS \ "calculated_vars=kernel_addr_r fdt_addr_r scriptaddr pxefile_addr_r " \ "ramdisk_addr_r\0" \ diff --git a/include/configs/paz00.h b/include/configs/paz00.h index 447f99af685..5c52a4e02b8 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -29,8 +29,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - #include "tegra-common-post.h"
#endif /* __CONFIG_H */ diff --git a/include/configs/plutux.h b/include/configs/plutux.h index 125a1f1f434..f61af5ae28d 100644 --- a/include/configs/plutux.h +++ b/include/configs/plutux.h @@ -28,10 +28,6 @@ /* USB host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - -/* General networking support */ - #include "tegra-common-post.h"
#endif /* __CONFIG_H */ diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index b8d02f03973..ef3848d6df0 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -37,8 +37,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - /* Enable keyboard */ #define CONFIG_TEGRA_KEYBOARD #define CONFIG_KEYBOARD diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index dd3e026b148..998e353c5e5 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -33,10 +33,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - -/* General networking support */ - /* Tag support */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/tec.h b/include/configs/tec.h index a40212190ab..e40bfb9ba12 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -28,8 +28,6 @@ /* USB host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - #include "tegra-common-post.h"
#endif /* __CONFIG_H */ diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 4d249ddfd27..e6b180f8fbc 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -39,15 +39,9 @@ */ #define CONFIG_SYS_MMC_MAX_DEVICE 4
-/* - * select serial console configuration - */ - /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE
-/* turn on command-line edit/hist/auto */ - /* * Increasing the size of the IO buffer as default nfsargs size is more * than 256 and so it is not possible to edit it diff --git a/include/configs/tegra210-common.h b/include/configs/tegra210-common.h index 16b962db640..1c533118ad0 100644 --- a/include/configs/tegra210-common.h +++ b/include/configs/tegra210-common.h @@ -14,10 +14,6 @@ */ #define V_NS16550_CLK 408000000 /* 408MHz (pllp_out0) */
-/*----------------------------------------------------------------------- - * Physical Memory Map - */ - /* Generic Interrupt Controller */ #define CONFIG_GICV2
diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h index 70964a90cea..2c7a1852aed 100644 --- a/include/configs/tegra30-common.h +++ b/include/configs/tegra30-common.h @@ -18,10 +18,6 @@ */ #define CONFIG_STACKBASE 0x82800000 /* 40MB */
-/*----------------------------------------------------------------------- - * Physical Memory Map - */ - /* * Memory layout for where various images get loaded by boot scripts: * diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 427da1c1c22..8972e1738a5 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -36,12 +36,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - -/* PCI host support */ - -/* General networking support */ - #include "tegra-common-post.h"
#endif /* __CONFIG_H */ diff --git a/include/configs/venice2.h b/include/configs/venice2.h index e542187efcd..8bb74aae1b1 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -34,10 +34,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - -/* General networking support */ - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h"
diff --git a/include/configs/ventana.h b/include/configs/ventana.h index 3f9db3303fd..7391262b499 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -27,8 +27,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */ - #include "tegra-common-post.h"
#endif /* __CONFIG_H */