Skip to content

Commit

Permalink
ARM: at91: fix nommu build regression
Browse files Browse the repository at this point in the history
The newly introduced support for SAMA5D4 added access to the
'AT91_ALT_BASE_SYS' register area, but failed to define the
symbols in the case when CONFIG_MMU is disabled.

We really should not hardwire addresses like this any more,
but as a small fixup, this patch just adds the missing
definitions for the nommu case, which gets at91x40_defconfig
and any configuration of sam9 and sama5 with MMU disabled
back to work.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 726d32b ("ARM: at91: SAMA5D4 SoC detection code and low ...")
  • Loading branch information
Arnd Bergmann committed Sep 26, 2014
1 parent 6d50424 commit e138e3a
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion arch/arm/mach-at91/include/mach/hardware.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,12 @@
*/
#define AT91_BASE_SYS 0xffffc000

#endif

/*
* On sama5d4 there is no system controller, we map some needed peripherals
*/
#define AT91_ALT_BASE_SYS 0xfc069000
#endif

/*
* On all at91 have the Advanced Interrupt Controller starts at address
Expand Down Expand Up @@ -90,6 +91,9 @@
*/
#define AT91_IO_PHYS_BASE AT91_BASE_SYS
#define AT91_IO_VIRT_BASE IOMEM(AT91_IO_PHYS_BASE)

#define AT91_ALT_IO_PHYS_BASE AT91_ALT_BASE_SYS
#define AT91_ALT_IO_VIRT_BASE IOMEM(AT91_ALT_BASE_SYS)
#endif

#define AT91_IO_SIZE (0xFFFFFFFF - AT91_IO_PHYS_BASE + 1)
Expand Down

0 comments on commit e138e3a

Please sign in to comment.