Commit cd7b6344 authored by Tom Rini's avatar Tom Rini

arm: Note vendor-required status of certain MACH_TYPE values

In the cases of some boards, a MACH_TYPE number is used which is either
not registered upstream or worse (for functionality) is re-using the
number of a different (or reference) platform instead.  Make sure we
have a comment in these cases.

Cc: Albert ARIBAUD <albert.aribaud@3adev.fr>
Cc: Walter Schweizer <swwa@users.sourceforge.net>
Cc: Stefan Roese <sr@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: 's avatarTom Rini <trini@konsulko.com>
Acked-by: 's avatarStefan Roese <sr@denx.de>
parent 4247fd69
......@@ -45,7 +45,7 @@ int board_init(void)
{
gpmc_init(); /* in SRAM or SDRAM, finish GPMC */
/* board id for Linux */
gd->bd->bi_arch_number = MACH_TYPE_OMAP3_CAIRO;
gd->bd->bi_arch_number = CONFIG_MACH_TYPE;
/* boot param addr */
gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
return 0;
......
......@@ -12,24 +12,13 @@
#ifndef _CONFIG_DS109_H
#define _CONFIG_DS109_H
/*
* FIXME: This belongs in mach-types.h. However, we only pull mach-types
* from Linus' kernel.org tree. This hasn't been updated primarily due to
* the recent arch/arm reshuffling. So, in the meantime, we'll place it
* here.
*/
#include <asm/mach-types.h>
#ifdef MACH_TYPE_SYNOLOGY
#error "MACH_TYPE_SYNOLOGY has been defined properly, please remove this."
#else
#define MACH_TYPE_SYNOLOGY 527
#endif
/* Provide the MACH_TYPE value that the vendor kernel requires. */
#define CONFIG_MACH_TYPE 527
/*
* High Level Configuration Options (easy to change)
*/
#define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */
#define CONFIG_MACH_TYPE MACH_TYPE_SYNOLOGY
/*
* Commands configuration
......
......@@ -15,8 +15,8 @@
#define CONFIG_EXYNOS5_DT
#define MACH_TYPE_SMDK5420 8002
#define CONFIG_MACH_TYPE MACH_TYPE_SMDK5420
/* Provide the MACH_TYPE value that the vendor kernel requires. */
#define CONFIG_MACH_TYPE 8002
#define CONFIG_VAR_SIZE_SPL
......
......@@ -228,9 +228,8 @@
#define CONFIG_SERIAL2
#endif
/* Provide MACH_TYPE for compatibility with non-DT kernels */
#define MACH_TYPE_OMAP3_CAIRO 3063
#define CONFIG_MACH_TYPE MACH_TYPE_OMAP3_CAIRO
/* Provide the MACH_TYPE value the vendor kernel requires */
#define CONFIG_MACH_TYPE 3063
/*-----------------------------------------------------------------------
* FLASH and environment organization
......
......@@ -17,8 +17,8 @@
#define CONFIG_MX6Q
#define MACH_TYPE_TITANIUM 3769
#define CONFIG_MACH_TYPE MACH_TYPE_TITANIUM
/* Provide the MACH_TYPE value that the vendor kernel requires. */
#define CONFIG_MACH_TYPE 3769
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024)
......
......@@ -13,8 +13,8 @@
#include "imx6_spl.h"
#define MACH_TYPE_UDOO 4800
#define CONFIG_MACH_TYPE MACH_TYPE_UDOO
/* Provide the MACH_TYPE value that the vendor kernel requires. */
#define CONFIG_MACH_TYPE 4800
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (2 * SZ_1M)
......
......@@ -18,8 +18,7 @@
* Define work_92105 machine type by hand -- done only for compatibility
* with original board code
*/
#define MACH_TYPE_WORK_92105 736
#define CONFIG_MACH_TYPE MACH_TYPE_WORK_92105
#define CONFIG_MACH_TYPE 736
#define CONFIG_SYS_ICACHE_OFF
#define CONFIG_SYS_DCACHE_OFF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment