From 07aa030a18552bcb1e9de30e348c6b59f4ffb6a5 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 24 May 2016 15:56:18 +0200 Subject: board: ge: bx50v3: make CONFIG_VIDEO optional and disabled by default The kernel already knows how to initialise the display, and initialising the display from U-boot is only useful for debugging and isn't necessary in production, so no need to have it enabled in U-boot by default. Signed-off-by: Andrew Shadura --- include/configs/ge_bx50v3.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'include/configs/ge_bx50v3.h') diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 1304879876..53f8689686 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -293,13 +293,14 @@ #define CONFIG_SYS_FSL_USDHC_NUM 3 +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE + /* Framebuffer */ -#define CONFIG_VIDEO +#ifdef CONFIG_VIDEO #define CONFIG_VIDEO_IPUV3 #define CONFIG_CFB_CONSOLE #define CONFIG_VGA_AS_SINGLE_DEVICE -#define CONFIG_SYS_CONSOLE_IS_IN_ENV -#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN @@ -309,6 +310,7 @@ #define CONFIG_IPUV3_CLK 260000000 #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP +#endif #define CONFIG_PWM_IMX #define CONFIG_IMX6_PWM_PER_CLK 66000000 -- cgit v1.2.3 From fc44902a0d447d561a6a30c8d3e3e1ecf535ff9d Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 24 May 2016 15:56:19 +0200 Subject: board: ge: bx50v3: make USB support optional and disabled by default The USB support is only useful for development and shouldn't be enabled in production, so it has to be disabled in U-boot by default. Signed-off-by: Andrew Shadura --- include/configs/ge_bx50v3.h | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'include/configs/ge_bx50v3.h') diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 53f8689686..602763f528 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -78,6 +78,7 @@ #define CONFIG_DOS_PARTITION /* USB Configs */ +#ifdef CONFIG_USB #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE @@ -99,6 +100,7 @@ #define CONFIG_G_DNL_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 #define CONFIG_G_DNL_MANUFACTURER "Advantech" +#endif /* Networking Configs */ #define CONFIG_FEC_MXC @@ -221,13 +223,7 @@ "bootm; " \ "fi;\0" \ -#define CONFIG_BOOTCOMMAND \ - "usb start; " \ - "setenv dev usb; " \ - "setenv devnum 0; " \ - "setenv rootdev sda1; " \ - "run tryboot; " \ - \ +#define CONFIG_MMCBOOTCOMMAND \ "setenv dev mmc; " \ "setenv rootdev mmcblk0p1; " \ \ @@ -241,9 +237,23 @@ "if mmc dev ${devnum}; then " \ "run tryboot; " \ "fi; " \ + +#define CONFIG_USBBOOTCOMMAND \ + "usb start; " \ + "setenv dev usb; " \ + "setenv devnum 0; " \ + "setenv rootdev sda1; " \ + "run tryboot; " \ \ + CONFIG_MMCBOOTCOMMAND \ "bmode usb; " \ +#ifdef CONFIG_CMD_USB +#define CONFIG_BOOTCOMMAND CONFIG_USBBOOTCOMMAND +#else +#define CONFIG_BOOTCOMMAND CONFIG_MMCBOOTCOMMAND +#endif + #define CONFIG_ARP_TIMEOUT 200UL /* Miscellaneous configurable options */ -- cgit v1.2.3 From c26ffd9b3cc20143058bb8917a137f8a25249d9a Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 24 May 2016 15:56:20 +0200 Subject: board: ge: bx50v3: make network support optional and disabled by default The network support is only useful for development and shouldn't be enabled in production, so it has to be disabled in U-boot by default. Signed-off-by: Andrew Shadura --- include/configs/ge_bx50v3.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/configs/ge_bx50v3.h') diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 602763f528..ccaa2b4e39 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -103,6 +103,7 @@ #endif /* Networking Configs */ +#ifdef CONFIG_NET #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR @@ -111,6 +112,7 @@ #define CONFIG_FEC_MXC_PHYADDR 4 #define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS +#endif /* Serial Flash */ #ifdef CONFIG_CMD_SF -- cgit v1.2.3 From aacc10c5be41dabdc7d8ad567b3bfff888ad4037 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 24 May 2016 15:56:21 +0200 Subject: board: ge: bx50v3: make SATA optional and disabled by default The SATA support is only useful for development and shouldn't be enabled in production, so it has to be disabled in U-boot by default. Signed-off-by: Andrew Shadura --- include/configs/ge_bx50v3.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/configs/ge_bx50v3.h') diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index ccaa2b4e39..98f20c6daa 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -60,13 +60,14 @@ #define CONFIG_MXC_OCOTP /* SATA Configs */ -#define CONFIG_CMD_SATA +#ifdef CONFIG_CMD_SATA #define CONFIG_DWC_AHSATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR #define CONFIG_LBA48 #define CONFIG_LIBATA +#endif /* MMC Configs */ #define CONFIG_FSL_ESDHC -- cgit v1.2.3 From f6825e4a449f83517742de00c56ef6ce4fda8f5a Mon Sep 17 00:00:00 2001 From: Kimmo Surakka Date: Tue, 24 May 2016 15:56:23 +0200 Subject: board: ge: bx50v3: add missing partnum variable Add missing ${partnum} to set rootdev correctly when booting from USB or MMC. Signed-off-by: Kimmo Surakka [Rebased against v2016.05 and adjusted the variable name] Signed-off-by: Andrew Shadura --- include/configs/ge_bx50v3.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/configs/ge_bx50v3.h') diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 98f20c6daa..40334601a3 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -228,12 +228,12 @@ #define CONFIG_MMCBOOTCOMMAND \ "setenv dev mmc; " \ - "setenv rootdev mmcblk0p1; " \ + "setenv rootdev mmcblk0p${partnum}; " \ \ "setenv devnum ${sddev}; " \ "if mmc dev ${devnum}; then " \ "run tryboot; " \ - "setenv rootdev mmcblk1p1; " \ + "setenv rootdev mmcblk1p${partnum}; " \ "fi; " \ \ "setenv devnum ${emmcdev}; " \ @@ -245,7 +245,7 @@ "usb start; " \ "setenv dev usb; " \ "setenv devnum 0; " \ - "setenv rootdev sda1; " \ + "setenv rootdev sda${partnum}; " \ "run tryboot; " \ \ CONFIG_MMCBOOTCOMMAND \ -- cgit v1.2.3