this patch set enable kernel uncompress info output
- sama5d3
- at91sam9n12
without this patch set, it won't show following information
---8>---
Uncompressing Linux... done, booting the kernel.
---<8---
Bo Shen (4):
arm: atmel: sama5: add definition for usart base address
arm: atmel: include sama5d3.h into hardware.h
arm: atmel: sama5: enable kernel uncompress info output
arm: atmel: sam9n12: enable kernel uncompress info output
arch/arm/mach-at91/include/mach/hardware.h | 1 +
arch/arm/mach-at91/include/mach/sama5d3.h | 8 ++++++++
arch/arm/mach-at91/include/mach/uncompress.h | 13 +++++++++++++
3 files changed, 22 insertions(+)
--
1.7.9.5
the sam9n12 use the same array usart as sam9x5, add it which will
enable output kernel uncompress info:
---8>---
Uncompressing Linux... done, booting the kernel.
---<8---
Signed-off-by: Bo Shen <[email protected]>
---
arch/arm/mach-at91/include/mach/uncompress.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-at91/include/mach/uncompress.h b/arch/arm/mach-at91/include/mach/uncompress.h
index fe097e6..4bb644f 100644
--- a/arch/arm/mach-at91/include/mach/uncompress.h
+++ b/arch/arm/mach-at91/include/mach/uncompress.h
@@ -130,6 +130,7 @@ static inline const u32* decomp_soc_detect(void __iomem *dbgu_base)
case ARCH_ID_AT91SAM9RL64:
return uarts_sam9rl;
+ case ARCH_ID_AT91SAM9N12:
case ARCH_ID_AT91SAM9X5:
return uarts_sam9x5;
--
1.7.9.5
include sama5d3.h into hardware.h
Signed-off-by: Bo Shen <[email protected]>
---
arch/arm/mach-at91/include/mach/hardware.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h
index a832e07..f17aa31 100644
--- a/arch/arm/mach-at91/include/mach/hardware.h
+++ b/arch/arm/mach-at91/include/mach/hardware.h
@@ -33,6 +33,7 @@
#include <mach/at91sam9g45.h>
#include <mach/at91sam9x5.h>
#include <mach/at91sam9n12.h>
+#include <mach/sama5d3.h>
/*
* On all at91 except rm9200 and x40 have the System Controller starts
--
1.7.9.5
enable kernel uncompress info output, which will show as following:
---8>---
Uncompressing Linux... done, booting the kernel.
---<8---
Signed-off-by: Bo Shen <[email protected]>
---
arch/arm/mach-at91/include/mach/uncompress.h | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/arm/mach-at91/include/mach/uncompress.h b/arch/arm/mach-at91/include/mach/uncompress.h
index 5659f7c..fe097e6 100644
--- a/arch/arm/mach-at91/include/mach/uncompress.h
+++ b/arch/arm/mach-at91/include/mach/uncompress.h
@@ -94,6 +94,15 @@ static const u32 uarts_sam9x5[] = {
0,
};
+static const u32 uarts_sama5[] = {
+ AT91_BASE_DBGU1,
+ SAMA5D3_BASE_USART0,
+ SAMA5D3_BASE_USART1,
+ SAMA5D3_BASE_USART2,
+ SAMA5D3_BASE_USART3,
+ 0,
+};
+
static inline const u32* decomp_soc_detect(void __iomem *dbgu_base)
{
u32 cidr, socid;
@@ -123,6 +132,9 @@ static inline const u32* decomp_soc_detect(void __iomem *dbgu_base)
case ARCH_ID_AT91SAM9X5:
return uarts_sam9x5;
+
+ case ARCH_ID_SAMA5D3:
+ return uarts_sama5;
}
/* at91sam9g10 */
--
1.7.9.5
add definition for usart base address
Signed-off-by: Bo Shen <[email protected]>
---
arch/arm/mach-at91/include/mach/sama5d3.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/mach-at91/include/mach/sama5d3.h b/arch/arm/mach-at91/include/mach/sama5d3.h
index 6dc81ee..31096a8 100644
--- a/arch/arm/mach-at91/include/mach/sama5d3.h
+++ b/arch/arm/mach-at91/include/mach/sama5d3.h
@@ -65,6 +65,14 @@
#define SAMA5D3_ID_IRQ0 47 /* Advanced Interrupt Controller (IRQ0) */
/*
+ * User Peripheral physical base addresses.
+ */
+#define SAMA5D3_BASE_USART0 0xf001c000
+#define SAMA5D3_BASE_USART1 0xf0020000
+#define SAMA5D3_BASE_USART2 0xf8020000
+#define SAMA5D3_BASE_USART3 0xf8024000
+
+/*
* Internal Memory
*/
#define SAMA5D3_SRAM_BASE 0x00300000 /* Internal SRAM base address */
--
1.7.9.5
On 04/07/2013 09:16, Bo Shen :
> this patch set enable kernel uncompress info output
> - sama5d3
> - at91sam9n12
Acked-by: Nicolas Ferre <[email protected]>
Whole series integrated in at91-3.12-soc branch.
Thanks, bye,
>
> without this patch set, it won't show following information
> ---8>---
> Uncompressing Linux... done, booting the kernel.
> ---<8---
>
>
> Bo Shen (4):
> arm: atmel: sama5: add definition for usart base address
> arm: atmel: include sama5d3.h into hardware.h
> arm: atmel: sama5: enable kernel uncompress info output
> arm: atmel: sam9n12: enable kernel uncompress info output
>
> arch/arm/mach-at91/include/mach/hardware.h | 1 +
> arch/arm/mach-at91/include/mach/sama5d3.h | 8 ++++++++
> arch/arm/mach-at91/include/mach/uncompress.h | 13 +++++++++++++
> 3 files changed, 22 insertions(+)
>
--
Nicolas Ferre
On 15:16 Thu 04 Jul , Bo Shen wrote:
> enable kernel uncompress info output, which will show as following:
> ---8>---
> Uncompressing Linux... done, booting the kernel.
> ---<8---
squash it with the precedent patch
Best Regards,
J,
>
> Signed-off-by: Bo Shen <[email protected]>
> ---
> arch/arm/mach-at91/include/mach/uncompress.h | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/arch/arm/mach-at91/include/mach/uncompress.h b/arch/arm/mach-at91/include/mach/uncompress.h
> index 5659f7c..fe097e6 100644
> --- a/arch/arm/mach-at91/include/mach/uncompress.h
> +++ b/arch/arm/mach-at91/include/mach/uncompress.h
> @@ -94,6 +94,15 @@ static const u32 uarts_sam9x5[] = {
> 0,
> };
>
> +static const u32 uarts_sama5[] = {
> + AT91_BASE_DBGU1,
> + SAMA5D3_BASE_USART0,
> + SAMA5D3_BASE_USART1,
> + SAMA5D3_BASE_USART2,
> + SAMA5D3_BASE_USART3,
> + 0,
> +};
> +
> static inline const u32* decomp_soc_detect(void __iomem *dbgu_base)
> {
> u32 cidr, socid;
> @@ -123,6 +132,9 @@ static inline const u32* decomp_soc_detect(void __iomem *dbgu_base)
>
> case ARCH_ID_AT91SAM9X5:
> return uarts_sam9x5;
> +
> + case ARCH_ID_SAMA5D3:
> + return uarts_sama5;
> }
>
> /* at91sam9g10 */
> --
> 1.7.9.5
>