Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
upstream u-boot with additional patches for our devices/boards: https://lists.denx.de/pipermail/u-boot/2017-March/282789.html (AXP crashes) ; Gbit ethernet patch for some LIME2 revisions ; with SPI flash support
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
36014 Commits
3 Branches
0 Tags
148 MiB
Tag: Branch: Tree: 651490212a
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '651490212a'
${ noResults }
u-boot/arch/arm/mach-uniphier/soc-info.h

77 lines
1.9 KiB
Raw Normal View History Unescape

ARM: uniphier: allow to enable multiple SoCs Before this commit, the Kconfig menu in mach-uniphier only allowed us to choose one SoC to be compiled. Each SoC has its own defconfig file for the build-test coverage. Consequently, some defconfig files are duplicated with only the difference in CONFIG_DEFAULT_DEVICE_TREE and CONFIG_{SOC_NAME}=y. Now, most of board-specific parameters have been moved to device trees, so it makes sense to include init code of multiple SoCs into a single image as long as the SoCs have similar architecture. In fact, some SoCs of UniPhier family are very similar: - PH1-LD4 and PH1-sLD8 - PH1-LD6b and ProXstream2 (will be added in the upcoming commit) This commit will be helpful to merge some defconfig files for better maintainability. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years ago
/*
* Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MACH_SOC_INFO_H__
#define __MACH_SOC_INFO_H__
enum uniphier_soc_id {
SOC_UNIPHIER_PH1_SLD3,
SOC_UNIPHIER_PH1_LD4,
SOC_UNIPHIER_PH1_PRO4,
SOC_UNIPHIER_PH1_SLD8,
SOC_UNIPHIER_PH1_PRO5,
SOC_UNIPHIER_PROXSTREAM2,
SOC_UNIPHIER_PH1_LD6B,
ARM: uniphier: add macros and revision IDs for sLD11 and LD10 These are new SoCs from Socionext Inc. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years ago
SOC_UNIPHIER_PH1_SLD11,
SOC_UNIPHIER_PH1_LD10,
ARM: uniphier: allow to enable multiple SoCs Before this commit, the Kconfig menu in mach-uniphier only allowed us to choose one SoC to be compiled. Each SoC has its own defconfig file for the build-test coverage. Consequently, some defconfig files are duplicated with only the difference in CONFIG_DEFAULT_DEVICE_TREE and CONFIG_{SOC_NAME}=y. Now, most of board-specific parameters have been moved to device trees, so it makes sense to include init code of multiple SoCs into a single image as long as the SoCs have similar architecture. In fact, some SoCs of UniPhier family are very similar: - PH1-LD4 and PH1-sLD8 - PH1-LD6b and ProXstream2 (will be added in the upcoming commit) This commit will be helpful to merge some defconfig files for better maintainability. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years ago
SOC_UNIPHIER_UNKNOWN,
};
#define UNIPHIER_NR_ENABLED_SOCS \
IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_SLD3) + \
IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_LD4) + \
IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_PRO4) + \
IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_SLD8) + \
IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_PRO5) + \
IS_ENABLED(CONFIG_ARCH_UNIPHIER_PROXSTREAM2) + \
ARM: uniphier: add macros and revision IDs for sLD11 and LD10 These are new SoCs from Socionext Inc. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years ago
IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_LD6B) + \
IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_SLD11) + \
IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_LD10)
ARM: uniphier: allow to enable multiple SoCs Before this commit, the Kconfig menu in mach-uniphier only allowed us to choose one SoC to be compiled. Each SoC has its own defconfig file for the build-test coverage. Consequently, some defconfig files are duplicated with only the difference in CONFIG_DEFAULT_DEVICE_TREE and CONFIG_{SOC_NAME}=y. Now, most of board-specific parameters have been moved to device trees, so it makes sense to include init code of multiple SoCs into a single image as long as the SoCs have similar architecture. In fact, some SoCs of UniPhier family are very similar: - PH1-LD4 and PH1-sLD8 - PH1-LD6b and ProXstream2 (will be added in the upcoming commit) This commit will be helpful to merge some defconfig files for better maintainability. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years ago
#define UNIPHIER_MULTI_SOC ((UNIPHIER_NR_ENABLED_SOCS) > 1)
#if UNIPHIER_MULTI_SOC
enum uniphier_soc_id uniphier_get_soc_type(void);
#else
static inline enum uniphier_soc_id uniphier_get_soc_type(void)
{
#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD3)
return SOC_UNIPHIER_PH1_SLD3;
#endif
#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD4)
return SOC_UNIPHIER_PH1_LD4;
#endif
#if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO4)
return SOC_UNIPHIER_PH1_PRO4;
#endif
#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD8)
return SOC_UNIPHIER_PH1_SLD8;
#endif
#if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO5)
return SOC_UNIPHIER_PH1_PRO5;
#endif
#if defined(CONFIG_ARCH_UNIPHIER_PROXSTREAM2)
return SOC_UNIPHIER_PROXSTREAM2;
#endif
#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD6B)
return SOC_UNIPHIER_PH1_LD6B;
#endif
ARM: uniphier: add macros and revision IDs for sLD11 and LD10 These are new SoCs from Socionext Inc. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years ago
#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD11)
return SOC_UNIPHIER_PH1_SLD11;
#endif
#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD10)
return SOC_UNIPHIER_PH1_LD10;
#endif
ARM: uniphier: allow to enable multiple SoCs Before this commit, the Kconfig menu in mach-uniphier only allowed us to choose one SoC to be compiled. Each SoC has its own defconfig file for the build-test coverage. Consequently, some defconfig files are duplicated with only the difference in CONFIG_DEFAULT_DEVICE_TREE and CONFIG_{SOC_NAME}=y. Now, most of board-specific parameters have been moved to device trees, so it makes sense to include init code of multiple SoCs into a single image as long as the SoCs have similar architecture. In fact, some SoCs of UniPhier family are very similar: - PH1-LD4 and PH1-sLD8 - PH1-LD6b and ProXstream2 (will be added in the upcoming commit) This commit will be helpful to merge some defconfig files for better maintainability. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years ago
return SOC_UNIPHIER_UNKNOWN;
}
#endif
ARM: uniphier: add functions to get SoC model/revision We sometimes have to implement different code depending on the SoC revision. This commit adds functions to get the model/revision number. Note: Model number: incremented on major changes of the SoC Revision number: incremented on minor changes of the SoC The "Model 2" exists for PH1-sLD3, ProXstream2/PH1-LD6b. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years ago
int uniphier_get_soc_model(void);
int uniphier_get_soc_revision(void);
ARM: uniphier: allow to enable multiple SoCs Before this commit, the Kconfig menu in mach-uniphier only allowed us to choose one SoC to be compiled. Each SoC has its own defconfig file for the build-test coverage. Consequently, some defconfig files are duplicated with only the difference in CONFIG_DEFAULT_DEVICE_TREE and CONFIG_{SOC_NAME}=y. Now, most of board-specific parameters have been moved to device trees, so it makes sense to include init code of multiple SoCs into a single image as long as the SoCs have similar architecture. In fact, some SoCs of UniPhier family are very similar: - PH1-LD4 and PH1-sLD8 - PH1-LD6b and ProXstream2 (will be added in the upcoming commit) This commit will be helpful to merge some defconfig files for better maintainability. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years ago
#endif /* __MACH_SOC_INFO_H__ */