diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-16 20:00:27 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-16 20:00:27 +0100 |
| commit | 4055a6684781790ca29c8e25b858d55af173e145 (patch) | |
| tree | 5277419819011036950cd397618b15126dad824b /arch/nds32 | |
| parent | 5428949153e8cd337ecb4180ad4fb68eb88a013b (diff) | |
| parent | 51b03637b8ecc9e5856db6a80631e3e8663020fd (diff) | |
| download | u-boot-imx-4055a6684781790ca29c8e25b858d55af173e145.zip u-boot-imx-4055a6684781790ca29c8e25b858d55af173e145.tar.gz u-boot-imx-4055a6684781790ca29c8e25b858d55af173e145.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-nds32
* 'master' of git://git.denx.de/u-boot-nds32:
adp-ag101p: add product into MAINTAINERS list
adp-ag101p: Add SoC and board support of ag101p
nds32: fix data section of linker script
dwcddr21mctl: Synopsys DWC DDR2/1 Memory Controller
andes_pcu.h: header file of andes_pcu power control unit
Diffstat (limited to 'arch/nds32')
| -rw-r--r-- | arch/nds32/cpu/n1213/u-boot.lds | 2 | ||||
| -rw-r--r-- | arch/nds32/include/asm/mach-types.h | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/arch/nds32/cpu/n1213/u-boot.lds b/arch/nds32/cpu/n1213/u-boot.lds index 45221ee..1903420 100644 --- a/arch/nds32/cpu/n1213/u-boot.lds +++ b/arch/nds32/cpu/n1213/u-boot.lds @@ -41,7 +41,7 @@ SECTIONS .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } . = ALIGN(4); - .data : { *(.data) } + .data : { *(.data*) } . = ALIGN(4); diff --git a/arch/nds32/include/asm/mach-types.h b/arch/nds32/include/asm/mach-types.h index a6f1c93..7b52b98 100644 --- a/arch/nds32/include/asm/mach-types.h +++ b/arch/nds32/include/asm/mach-types.h @@ -26,4 +26,18 @@ extern unsigned int __machine_arch_type; # define machine_is_adpag101() (0) #endif +#define MACH_TYPE_ADPAG101P 1 + +#ifdef CONFIG_ARCH_ADPAG101P +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_ADPAG101P +# endif +# define machine_is_adpag101p() (machine_arch_type == MACH_TYPE_ADPAG101P) +#else +# define machine_is_adpag101p() (1) +#endif + #endif /* __ASM_NDS32_MACH_TYPE_H */ |