Skip to content

Commit 35bb7f3

Browse files
Add BCM2708_UNCOMPRESS_INFO option
Add a configuration option that can enable or disable the uncompress info on the BCM2708 and BCM2709 family of processors. Disabling this can be handy if the UART pin is needed for something else, and the user does not want the info to be sent out on the UART.
1 parent 2dae3c6 commit 35bb7f3

File tree

4 files changed

+36
-0
lines changed

4 files changed

+36
-0
lines changed

arch/arm/mach-bcm2708/Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,11 @@ config BCM2708_SPIDEV
4949
default y
5050
help
5151
Binds spidev driver to the SPI0 master
52+
53+
config BCM2708_UNCOMPRESS_INFO
54+
bool "Enable uncompress info on UART"
55+
depends on MACH_BCM2708
56+
default y
57+
help
58+
Enables the "Uncompressing Linux..." message on the UART on startup
5259
endmenu

arch/arm/mach-bcm2708/include/mach/uncompress.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
#include <linux/amba/serial.h>
2424
#include <mach/hardware.h>
2525

26+
#ifdef CONFIG_BCM2708_UNCOMPRESS_INFO
27+
2628
#define UART_BAUD 115200
2729

2830
#define BCM2708_UART_DR __io(UART0_BASE + UART01x_DR)
@@ -82,3 +84,12 @@ static inline void arch_decomp_setup(void)
8284
* nothing to do
8385
*/
8486
#define arch_decomp_wdog()
87+
88+
#else /* CONFIG_BCM2708_UNCOMPRESS_INFO */
89+
90+
#define putc(c)
91+
#define flush()
92+
#define arch_decomp_setup()
93+
#define arch_decomp_wdog()
94+
95+
#endif /* CONFIG_BCM2708_UNCOMPRESS_INFO */

arch/arm/mach-bcm2709/Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,11 @@ config BCM2708_SPIDEV
4646
default y
4747
help
4848
Binds spidev driver to the SPI0 master
49+
50+
config BCM2708_UNCOMPRESS_INFO
51+
bool "Enable uncompress info on UART"
52+
depends on MACH_BCM2709
53+
default y
54+
help
55+
Enables the "Uncompressing Linux..." message on the UART on startup
4956
endmenu

arch/arm/mach-bcm2709/include/mach/uncompress.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
#include <linux/amba/serial.h>
2424
#include <mach/hardware.h>
2525

26+
#ifdef CONFIG_BCM2708_UNCOMPRESS_INFO
27+
2628
#define UART_BAUD 115200
2729

2830
#define BCM2708_UART_DR __io(UART0_BASE + UART01x_DR)
@@ -82,3 +84,12 @@ static inline void arch_decomp_setup(void)
8284
* nothing to do
8385
*/
8486
#define arch_decomp_wdog()
87+
88+
#else /* CONFIG_BCM2708_UNCOMPRESS_INFO */
89+
90+
#define putc(c)
91+
#define flush()
92+
#define arch_decomp_setup()
93+
#define arch_decomp_wdog()
94+
95+
#endif /* CONFIG_BCM2708_UNCOMPRESS_INFO */

0 commit comments

Comments
 (0)