diff options
| author | Rabin Vincent <rabin.vincent@stericsson.com> | 2010-08-18 19:07:04 +0530 |
|---|---|---|
| committer | Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> | 2010-10-23 13:29:27 +0200 |
| commit | 7453c8cf7cae31d9989da61a7c5d1f33ffe7a64b (patch) | |
| tree | 8939a91d9ea55d1d70752c3adacf5fe746297e74 /tools | |
| parent | ba9fe55e95fb196489275a051eca3294c3415fde (diff) | |
ux500: add SVP8500v2 support
Since SVP8500 does not update the MIDR, we use different mach types to
differentiate between the revisions.
ST-Ericsson ID: AP269737
Change-Id: I637a0ee6db24719a85fc78880c19cb82626dc98e
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/3914
Reviewed-by: Carl-Johan IREKVIST <carl-johan.irekvist@stericsson.com>
Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/svpboot/Makefile | 4 | ||||
| -rw-r--r-- | tools/svpboot/svp8500v1.S | 2 | ||||
| -rw-r--r-- | tools/svpboot/svp8500v2.S | 36 | ||||
| -rw-r--r-- | tools/svpboot/svpboot.S | 2 |
4 files changed, 42 insertions, 2 deletions
diff --git a/tools/svpboot/Makefile b/tools/svpboot/Makefile index a851fa16ca7..59aff9b08c8 100644 --- a/tools/svpboot/Makefile +++ b/tools/svpboot/Makefile @@ -7,13 +7,15 @@ ASFLAGS = -D__ASSEMBLY__ -I$(KERNELDIR)/include -I$(KERNELDIR)/arch/arm/include ASFLAGS += -I$(KERNELDIR)/arch/arm/mach-ux500/include LDFLAGS = -nostdlib -Wl,-T,$(SCRIPT) -OBJS = svp5500 svp8500v1 +OBJS = svp5500 svp8500v1 svp8500v2 all: $(CC) $(ASFLAGS) -c svpboot.S -DSVP5500 -o svp5500.o $(CC) $(ASFLAGS) -c svpboot.S -DSVP8500V1 -o svp8500v1.o + $(CC) $(ASFLAGS) -c svpboot.S -DSVP8500V2 -o svp8500v2.o $(CC) $(LDFLAGS) svp5500.o -o svp5500 $(CC) $(LDFLAGS) svp8500v1.o -o svp8500v1 + $(CC) $(LDFLAGS) svp8500v2.o -o svp8500v2 clean: rm -rf $(OBJS) *.o *.bin diff --git a/tools/svpboot/svp8500v1.S b/tools/svpboot/svp8500v1.S index 0d11ac6e590..d3507e1031a 100644 --- a/tools/svpboot/svp8500v1.S +++ b/tools/svpboot/svp8500v1.S @@ -9,7 +9,7 @@ #include <asm/mach-types.h> #include <mach/hardware.h> -#define MACH_TYPE MACH_TYPE_U8500 +#define MACH_TYPE MACH_TYPE_SVP8500V1 #define CMDLINE \ "root=/dev/ram0 init=init rw " \ "console=ttyAMA2,115200n8 " \ diff --git a/tools/svpboot/svp8500v2.S b/tools/svpboot/svp8500v2.S new file mode 100644 index 00000000000..b8235d2defe --- /dev/null +++ b/tools/svpboot/svp8500v2.S @@ -0,0 +1,36 @@ +/* + * Copyright (C) ST-Ericsson SA 2010 + * + * Author: Rabin Vincent <rabin.vincent@stericsson.com> + * License terms: GNU General Public License (GPL) version 2 + */ + +#include <linux/amba/serial.h> +#include <asm/mach-types.h> +#include <mach/hardware.h> + +#define MACH_TYPE MACH_TYPE_SVP8500V2 +#define CMDLINE \ + "root=/dev/ram0 init=init rw " \ + "console=ttyAMA2,115200n8 " \ + "mem=256M " \ + "initrd=0x800000,60M " \ + "earlyprintk" \ + +#define CPU1_WAKEMAGIC_ADDR (U8500_BACKUPRAM0_BASE + 0x1ff0) + +#define NMK_GPIO_AFSLA 0x20 +#define NMK_GPIO_AFSLB 0x24 + +.macro init_console_uart + /* Enable GPIOs for UART2 (29, 30 -> AltC) */ + ldr r5, =U8500_GPIO0_BASE + ldr r6, =((1 << 29) | (1 << 30)) + str r6, [r5, #NMK_GPIO_AFSLA] + str r6, [r5, #NMK_GPIO_AFSLB] + + /* Enable UART2 */ + ldr r5, =U8500_UART2_BASE + ldr r6, =(UART011_CR_TXE | UART01x_CR_UARTEN) + str r6, [r5, #UART011_CR] +.endm diff --git a/tools/svpboot/svpboot.S b/tools/svpboot/svpboot.S index 9024dbf6f0c..51c478f1b6d 100644 --- a/tools/svpboot/svpboot.S +++ b/tools/svpboot/svpboot.S @@ -12,6 +12,8 @@ #include "svp5500.S" #elif defined(SVP8500V1) #include "svp8500v1.S" +#elif defined(SVP8500V2) +#include "svp8500v2.S" #endif .text |