mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-03 01:50:43 +09:00
mxs: Use __weak annotation to simplify code
Using the __weak annotation can make the code cleaner. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Marek Vasut <marex@denx.de>
This commit is contained in:
parent
6e08385715
commit
f093088214
@ -35,6 +35,7 @@
|
|||||||
#include <asm/arch/iomux.h>
|
#include <asm/arch/iomux.h>
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <asm/arch/imx-regs.h>
|
||||||
#include <asm/arch/sys_proto.h>
|
#include <asm/arch/sys_proto.h>
|
||||||
|
#include <linux/compiler.h>
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
@ -293,7 +294,7 @@ int cpu_eth_init(bd_t *bis)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void __mx28_adjust_mac(int dev_id, unsigned char *mac)
|
__weak void mx28_adjust_mac(int dev_id, unsigned char *mac)
|
||||||
{
|
{
|
||||||
mac[0] = 0x00;
|
mac[0] = 0x00;
|
||||||
mac[1] = 0x04; /* Use FSL vendor MAC address by default */
|
mac[1] = 0x04; /* Use FSL vendor MAC address by default */
|
||||||
@ -302,9 +303,6 @@ static void __mx28_adjust_mac(int dev_id, unsigned char *mac)
|
|||||||
mac[5] += 1;
|
mac[5] += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void mx28_adjust_mac(int dev_id, unsigned char *mac)
|
|
||||||
__attribute__((weak, alias("__mx28_adjust_mac")));
|
|
||||||
|
|
||||||
#ifdef CONFIG_MX28_FEC_MAC_IN_OCOTP
|
#ifdef CONFIG_MX28_FEC_MAC_IN_OCOTP
|
||||||
|
|
||||||
#define MXS_OCOTP_MAX_TIMEOUT 1000000
|
#define MXS_OCOTP_MAX_TIMEOUT 1000000
|
||||||
|
@ -27,6 +27,7 @@
|
|||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <asm/arch/imx-regs.h>
|
||||||
|
#include <linux/compiler.h>
|
||||||
|
|
||||||
#include "mxs_init.h"
|
#include "mxs_init.h"
|
||||||
|
|
||||||
@ -104,11 +105,9 @@ static uint32_t dram_vals[] = {
|
|||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
void __mxs_adjust_memory_params(uint32_t *dram_vals)
|
__weak void mxs_adjust_memory_params(uint32_t *dram_vals)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
void mxs_adjust_memory_params(uint32_t *dram_vals)
|
|
||||||
__attribute__((weak, alias("__mxs_adjust_memory_params")));
|
|
||||||
|
|
||||||
static void initialize_dram_values(void)
|
static void initialize_dram_values(void)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user