mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-14 08:57:58 +00:00
e856bdcfb4
We repeated partial moves for CONFIG_SYS_NO_FLASH, but this is
not completed. Finish this work by the tool.
During this move, let's rename it to CONFIG_MTD_NOR_FLASH.
Actually, we have more instances of "#ifndef CONFIG_SYS_NO_FLASH"
than those of "#ifdef CONFIG_SYS_NO_FLASH". Flipping the logic will
make the code more readable. Besides, negative meaning symbols do
not fit in obj-$(CONFIG_...) style Makefiles.
This commit was created as follows:
[1] Edit "default n" to "default y" in the config entry in
common/Kconfig.
[2] Run "tools/moveconfig.py -y -r HEAD SYS_NO_FLASH"
[3] Rename the instances in defconfigs by the following:
find . -path './configs/*_defconfig' | xargs sed -i \
-e '/CONFIG_SYS_NO_FLASH=y/d' \
-e 's/# CONFIG_SYS_NO_FLASH is not set/CONFIG_MTD_NOR_FLASH=y/'
[4] Change the conditionals by the following:
find . -name '*.[ch]' | xargs sed -i \
-e 's/ifndef CONFIG_SYS_NO_FLASH/ifdef CONFIG_MTD_NOR_FLASH/' \
-e 's/ifdef CONFIG_SYS_NO_FLASH/ifndef CONFIG_MTD_NOR_FLASH/' \
-e 's/!defined(CONFIG_SYS_NO_FLASH)/defined(CONFIG_MTD_NOR_FLASH)/' \
-e 's/defined(CONFIG_SYS_NO_FLASH)/!defined(CONFIG_MTD_NOR_FLASH)/'
[5] Modify the following manually
- Rename the rest of instances
- Remove the description from README
- Create the new Kconfig entry in drivers/mtd/Kconfig
- Remove the old Kconfig entry from common/Kconfig
- Remove the garbage comments from include/configs/*.h
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
60 lines
1.2 KiB
C
60 lines
1.2 KiB
C
/*
|
|
* U-Boot - main board file
|
|
*
|
|
* Copyright (c) 2005-2009 Analog Devices Inc.
|
|
*
|
|
* Licensed under the GPL-2 or later.
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <config.h>
|
|
#include <command.h>
|
|
#include <net.h>
|
|
#include <netdev.h>
|
|
#include <asm/blackfin.h>
|
|
#include <asm/mach-common/bits/otp.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
int checkboard(void)
|
|
{
|
|
printf("Board: ADI BF526 EZ-Board board\n");
|
|
printf(" Support: http://blackfin.uclinux.org/\n");
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_BFIN_MAC
|
|
static void board_init_enetaddr(uchar *mac_addr)
|
|
{
|
|
#ifdef CONFIG_MTD_NOR_FLASH
|
|
/* we cram the MAC in the last flash sector */
|
|
uchar *board_mac_addr = (uchar *)0x203F0096;
|
|
if (is_valid_ethaddr(board_mac_addr)) {
|
|
memcpy(mac_addr, board_mac_addr, 6);
|
|
eth_setenv_enetaddr("ethaddr", mac_addr);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
int board_eth_init(bd_t *bis)
|
|
{
|
|
return bfin_EMAC_initialize(bis);
|
|
}
|
|
#endif
|
|
|
|
int misc_init_r(void)
|
|
{
|
|
#ifdef CONFIG_BFIN_MAC
|
|
uchar enetaddr[6];
|
|
if (!eth_getenv_enetaddr("ethaddr", enetaddr))
|
|
board_init_enetaddr(enetaddr);
|
|
#endif
|
|
|
|
#ifdef CONFIG_MTD_NOR_FLASH
|
|
/* we use the last sector for the MAC address / POST LDR */
|
|
extern flash_info_t flash_info[];
|
|
flash_protect(FLAG_PROTECT_SET, 0x203F0000, 0x203FFFFF, &flash_info[0]);
|
|
#endif
|
|
|
|
return 0;
|
|
}
|