X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fkm_kirkwood.h;h=82c2a129223e6fd071e84c086dd42e9d390cb2cd;hb=f9a48654ee70fbad29f487d074fd36a1548b4209;hp=74c72325f65bf17ee006497f3879f9028040f409;hpb=4641c211f6e37454c30770521c4de79c725036b0;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/km_kirkwood.h b/include/configs/km_kirkwood.h index 74c7232..82c2a12 100644 --- a/include/configs/km_kirkwood.h +++ b/include/configs/km_kirkwood.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2009 * Marvell Semiconductor @@ -9,8 +10,6 @@ * (C) Copyright 2011-2012 * Holger Brunck, Keymile GmbH Hannover, holger.brunck@keymile.com * Valentin Longchamp, Keymile AG, valentin.longchamp@keymile.com - * - * SPDX-License-Identifier: GPL-2.0+ */ /* @@ -23,83 +22,44 @@ /* KM_KIRKWOOD */ #if defined(CONFIG_KM_KIRKWOOD) -#define CONFIG_IDENT_STRING "\nKeymile Kirkwood" -#define CONFIG_HOSTNAME km_kirkwood +#define CONFIG_HOSTNAME "km_kirkwood" #define CONFIG_KM_DISABLE_PCIE -#define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ /* KM_KIRKWOOD_PCI */ #elif defined(CONFIG_KM_KIRKWOOD_PCI) -#define CONFIG_IDENT_STRING "\nKeymile Kirkwood PCI" -#define CONFIG_HOSTNAME km_kirkwood_pci -#define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ -#define CONFIG_KM_FPGA_CONFIG +#define CONFIG_HOSTNAME "km_kirkwood_pci" +#define CONFIG_KM_UBI_PART_BOOT_OPTS ",2048" +#define CONFIG_SYS_NAND_NO_SUBPAGE_WRITE /* KM_KIRKWOOD_128M16 */ #elif defined(CONFIG_KM_KIRKWOOD_128M16) -#define CONFIG_IDENT_STRING "\nKeymile Kirkwood 128M16" -#define CONFIG_HOSTNAME km_kirkwood_128m16 +#define CONFIG_HOSTNAME "km_kirkwood_128m16" #undef CONFIG_SYS_KWD_CONFIG -#define CONFIG_SYS_KWD_CONFIG \ - $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg +#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg #define CONFIG_KM_DISABLE_PCIE -#define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ /* KM_NUSA */ #elif defined(CONFIG_KM_NUSA) -#define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ -#define CONFIG_IDENT_STRING "\nKeymile NUSA" -#define CONFIG_HOSTNAME kmnusa -#undef CONFIG_SYS_KWD_CONFIG -#define CONFIG_SYS_KWD_CONFIG \ - $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg -#define CONFIG_KM_ENV_IS_IN_SPI_NOR -#define CONFIG_KM_FPGA_CONFIG -#define CONFIG_KM_PIGGY4_88E6352 -#define CONFIG_MV88E6352_SWITCH -#define CONFIG_KM_MVEXTSW_ADDR 0x10 - -/* KM_MGCOGE3UN */ -#elif defined(CONFIG_KM_MGCOGE3UN) -#define CONFIG_IDENT_STRING "\nKeymile COGE3UN" -#define CONFIG_HOSTNAME mgcoge3un -#define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ + +#define CONFIG_HOSTNAME "kmnusa" + #undef CONFIG_SYS_KWD_CONFIG -#define CONFIG_SYS_KWD_CONFIG \ - $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage-memphis.cfg -#define CONFIG_KM_BOARD_EXTRA_ENV "waitforne=true\0" -#define CONFIG_PIGGY_MAC_ADRESS_OFFSET 3 -#define CONFIG_KM_DISABLE_PCIE -#define CONFIG_KM_PIGGY4_88E6061 +#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg /* KMCOGE5UN */ #elif defined(CONFIG_KM_COGE5UN) -#define CONFIG_IDENT_STRING "\nKeymile COGE5UN" -#define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ #undef CONFIG_SYS_KWD_CONFIG -#define CONFIG_SYS_KWD_CONFIG \ - $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage_256M8_1.cfg -#define CONFIG_KM_ENV_IS_IN_SPI_NOR -#define CONFIG_PIGGY_MAC_ADRESS_OFFSET 3 -#define CONFIG_HOSTNAME kmcoge5un +#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_256M8_1.cfg +#define CONFIG_HOSTNAME "kmcoge5un" #define CONFIG_KM_DISABLE_PCIE -#define CONFIG_KM_PIGGY4_88E6352 - -/* KM_PORTL2 */ -#elif defined(CONFIG_KM_PORTL2) -#define CONFIG_IDENT_STRING "\nKeymile Port-L2" -#define CONFIG_HOSTNAME portl2 -#define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ -#define CONFIG_KM_PIGGY4_88E6061 - -/* KM_SUV31 */ -#elif defined(CONFIG_KM_SUV31) -#define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ -#define CONFIG_IDENT_STRING "\nKeymile SUV31" -#define CONFIG_HOSTNAME kmsuv31 -#define CONFIG_KM_ENV_IS_IN_SPI_NOR -#define CONFIG_KM_FPGA_CONFIG +/* KM_SUSE2 */ +#elif defined(CONFIG_KM_SUSE2) +#define CONFIG_HOSTNAME "kmsuse2" +#undef CONFIG_SYS_KWD_CONFIG +#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg +#define CONFIG_KM_UBI_PART_BOOT_OPTS ",2048" +#define CONFIG_SYS_NAND_NO_SUBPAGE_WRITE #else #error ("Board unsupported") #endif @@ -107,10 +67,6 @@ /* include common defines/options for all arm based Keymile boards */ #include "km/km_arm.h" -#ifndef CONFIG_KM_ENV_IS_IN_SPI_NOR -#define KM_ENV_BUS 5 /* I2C2 (Mux-Port 5)*/ -#endif - #if defined(CONFIG_KM_PIGGY4_88E6352) /* * Some keymile boards like mgcoge5un & nusa1 have their PIGGY4 connected via @@ -144,7 +100,7 @@ #ifdef CONFIG_KM_PIGGY4_88E6061 /* - * Some keymile boards like mgcoge3un have their PIGGY4 connected via + * Some keymile boards like mgcoge5un have their PIGGY4 connected via * an Marvell 88E6061 simple switch. * In this case we have to change the default settings for the * ethernet phy connected to the kirkwood. @@ -171,9 +127,8 @@ MVGBE_SET_MII_SPEED_TO_100) #endif -#ifdef CONFIG_KM_DISABLE_PCI +#ifdef CONFIG_KM_DISABLE_PCIE #undef CONFIG_KIRKWOOD_PCIE_INIT #endif - #endif /* _CONFIG_KM_KIRKWOOD */