Commit f0930882 authored by Fabio Estevam's avatar Fabio Estevam Committed by Stefano Babic

mxs: Use __weak annotation to simplify code

Using the __weak annotation can make the code cleaner.
Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Acked-by: default avatarMarek Vasut <marex@denx.de>
parent 6e083857
......@@ -35,6 +35,7 @@
#include <asm/arch/iomux.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/sys_proto.h>
#include <linux/compiler.h>
DECLARE_GLOBAL_DATA_PTR;
......@@ -293,7 +294,7 @@ int cpu_eth_init(bd_t *bis)
}
#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[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;
}
void mx28_adjust_mac(int dev_id, unsigned char *mac)
__attribute__((weak, alias("__mx28_adjust_mac")));
#ifdef CONFIG_MX28_FEC_MAC_IN_OCOTP
#define MXS_OCOTP_MAX_TIMEOUT 1000000
......
......@@ -27,6 +27,7 @@
#include <config.h>
#include <asm/io.h>
#include <asm/arch/imx-regs.h>
#include <linux/compiler.h>
#include "mxs_init.h"
......@@ -104,11 +105,9 @@ static uint32_t dram_vals[] = {
#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)
{
......
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