* [PATCH 1/1] at91sam9260ek: specify mach entry
@ 2012-11-16 17:19 Jean-Christophe PLAGNIOL-VILLARD
2012-11-16 17:19 ` [PATCH 1/3] phylib: export phy_id via param Jean-Christophe PLAGNIOL-VILLARD
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-11-16 17:19 UTC (permalink / raw)
To: barebox
as the sam9260ek may not be the first one in the list
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/configs/at91sam9260ek_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig
index b746bc8..9c5c7d5 100644
--- a/arch/arm/configs/at91sam9260ek_defconfig
+++ b/arch/arm/configs/at91sam9260ek_defconfig
@@ -1,4 +1,5 @@
CONFIG_ARCH_AT91SAM9260=y
+CONFIG_MACH_AT91SAM9260EK=y
CONFIG_AEABI=y
# CONFIG_CMD_ARM_CPUINFO is not set
CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/3] phylib: export phy_id via param 2012-11-16 17:19 [PATCH 1/1] at91sam9260ek: specify mach entry Jean-Christophe PLAGNIOL-VILLARD @ 2012-11-16 17:19 ` Jean-Christophe PLAGNIOL-VILLARD 2012-11-16 17:19 ` [PATCH 2/3] phylib: introduction of forced 100Mbps Jean-Christophe PLAGNIOL-VILLARD ` (2 subsequent siblings) 3 siblings, 0 replies; 7+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-11-16 17:19 UTC (permalink / raw) To: barebox Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> --- drivers/net/phy/mdio_bus.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index e36641e..b0c6231 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -191,6 +191,9 @@ static int mdio_bus_probe(struct device_d *_dev) sprintf(str, "%d", dev->addr); dev_add_param_fixed(&dev->dev, "phy_addr", str); + sprintf(str, "0x%08x", dev->phy_id); + dev_add_param_fixed(&dev->dev, "phy_id", str); + dev->cdev.name = asprintf("phy%d", _dev->id); dev->cdev.size = 64; dev->cdev.ops = &phydev_ops; -- 1.7.10.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/3] phylib: introduction of forced 100Mbps 2012-11-16 17:19 [PATCH 1/1] at91sam9260ek: specify mach entry Jean-Christophe PLAGNIOL-VILLARD 2012-11-16 17:19 ` [PATCH 1/3] phylib: export phy_id via param Jean-Christophe PLAGNIOL-VILLARD @ 2012-11-16 17:19 ` Jean-Christophe PLAGNIOL-VILLARD 2012-11-16 17:19 ` [PATCH 3/3] macb/ether: split flags for drivers and phylib Jean-Christophe PLAGNIOL-VILLARD 2012-11-19 9:20 ` [PATCH 1/1] at91sam9260ek: specify mach entry Sascha Hauer 3 siblings, 0 replies; 7+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-11-16 17:19 UTC (permalink / raw) To: barebox Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> --- drivers/net/phy/mdio_bus.c | 4 ++++ include/linux/phy.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index b0c6231..0e7ca93 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -171,6 +171,10 @@ static int mdio_bus_probe(struct device_d *_dev) dev->speed = SPEED_10; dev->duplex = DUPLEX_FULL; dev->autoneg = !AUTONEG_ENABLE; + } else if (dev->dev_flags & PHYLIB_FORCE_100) { + dev->speed = SPEED_100; + dev->duplex = DUPLEX_FULL; + dev->autoneg = !AUTONEG_ENABLE; } } diff --git a/include/linux/phy.h b/include/linux/phy.h index 3892bb3..af61fa7 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -60,7 +60,8 @@ typedef enum { #define MII_BUS_ID_SIZE (20 - 3) #define PHYLIB_FORCE_10 (1 << 0) -#define PHYLIB_FORCE_LINK (1 << 1) +#define PHYLIB_FORCE_100 (1 << 1) +#define PHYLIB_FORCE_LINK (1 << 2) #define PHYLIB_CAPABLE_1000M (1 << 0) -- 1.7.10.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 3/3] macb/ether: split flags for drivers and phylib 2012-11-16 17:19 [PATCH 1/1] at91sam9260ek: specify mach entry Jean-Christophe PLAGNIOL-VILLARD 2012-11-16 17:19 ` [PATCH 1/3] phylib: export phy_id via param Jean-Christophe PLAGNIOL-VILLARD 2012-11-16 17:19 ` [PATCH 2/3] phylib: introduction of forced 100Mbps Jean-Christophe PLAGNIOL-VILLARD @ 2012-11-16 17:19 ` Jean-Christophe PLAGNIOL-VILLARD 2012-11-19 9:20 ` [PATCH 1/1] at91sam9260ek: specify mach entry Sascha Hauer 3 siblings, 0 replies; 7+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-11-16 17:19 UTC (permalink / raw) To: barebox as in the kernel use is_rmii flags for pinctrl phy_flags for phylib flags Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> --- arch/arm/boards/at91rm9200ek/init.c | 2 +- arch/arm/boards/at91sam9260ek/init.c | 2 +- arch/arm/boards/at91sam9263ek/init.c | 2 +- arch/arm/boards/at91sam9m10g45ek/init.c | 2 +- arch/arm/boards/at91sam9x5ek/init.c | 2 +- arch/arm/boards/mmccpu/init.c | 2 +- arch/arm/boards/pm9263/init.c | 2 +- arch/arm/boards/pm9g45/init.c | 2 +- arch/arm/boards/qil-a9260/init.c | 2 +- arch/arm/boards/tny-a926x/init.c | 2 +- arch/arm/boards/usb-a926x/init.c | 2 +- arch/arm/mach-at91/at91rm9200_devices.c | 2 +- arch/arm/mach-at91/at91sam9260_devices.c | 2 +- arch/arm/mach-at91/at91sam9263_devices.c | 2 +- arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- arch/arm/mach-at91/at91sam9x5_devices.c | 4 ++-- arch/arm/mach-at91/include/mach/board.h | 7 +++---- drivers/net/at91_ether.c | 2 +- drivers/net/macb.c | 5 ++--- 19 files changed, 23 insertions(+), 25 deletions(-) diff --git a/arch/arm/boards/at91rm9200ek/init.c b/arch/arm/boards/at91rm9200ek/init.c index 439ee9e..f5d242f 100644 --- a/arch/arm/boards/at91rm9200ek/init.c +++ b/arch/arm/boards/at91rm9200ek/init.c @@ -33,7 +33,7 @@ #include <spi/spi.h> static struct at91_ether_platform_data ether_pdata = { - .flags = AT91SAM_ETHER_RMII, + .is_rmii = 1, .phy_addr = 0, }; diff --git a/arch/arm/boards/at91sam9260ek/init.c b/arch/arm/boards/at91sam9260ek/init.c index d0a8458..e9bfee6 100644 --- a/arch/arm/boards/at91sam9260ek/init.c +++ b/arch/arm/boards/at91sam9260ek/init.c @@ -128,7 +128,7 @@ static void ek_add_device_nand(void) } static struct at91_ether_platform_data macb_pdata = { - .flags = AT91SAM_ETHER_RMII, + .is_rmii = 1, .phy_addr = 0, }; diff --git a/arch/arm/boards/at91sam9263ek/init.c b/arch/arm/boards/at91sam9263ek/init.c index b577f4d..45a30fd 100644 --- a/arch/arm/boards/at91sam9263ek/init.c +++ b/arch/arm/boards/at91sam9263ek/init.c @@ -84,7 +84,7 @@ static void ek_add_device_nand(void) } static struct at91_ether_platform_data macb_pdata = { - .flags = AT91SAM_ETHER_RMII, + .is_rmii = 1, .phy_addr = 0, }; diff --git a/arch/arm/boards/at91sam9m10g45ek/init.c b/arch/arm/boards/at91sam9m10g45ek/init.c index f1c43cc..0c03dea 100644 --- a/arch/arm/boards/at91sam9m10g45ek/init.c +++ b/arch/arm/boards/at91sam9m10g45ek/init.c @@ -107,7 +107,7 @@ static void ek_add_device_nand(void) } static struct at91_ether_platform_data macb_pdata = { - .flags = AT91SAM_ETHER_RMII, + .is_rmii = 1, .phy_addr = 0, }; diff --git a/arch/arm/boards/at91sam9x5ek/init.c b/arch/arm/boards/at91sam9x5ek/init.c index 5626577..ba5bc47 100644 --- a/arch/arm/boards/at91sam9x5ek/init.c +++ b/arch/arm/boards/at91sam9x5ek/init.c @@ -106,7 +106,7 @@ static void ek_add_device_nand(void) } static struct at91_ether_platform_data macb_pdata = { - .flags = AT91SAM_ETHER_RMII, + .is_rmii = 1, .phy_addr = 0, }; diff --git a/arch/arm/boards/mmccpu/init.c b/arch/arm/boards/mmccpu/init.c index 97248b9..67bfcea 100644 --- a/arch/arm/boards/mmccpu/init.c +++ b/arch/arm/boards/mmccpu/init.c @@ -34,7 +34,7 @@ #include <mach/io.h> static struct at91_ether_platform_data macb_pdata = { - .flags = AT91SAM_ETHER_MII | AT91SAM_ETHER_FORCE_LINK, + .phy_flags = PHYLIB_FORCE_LINK, .phy_addr = 4, }; diff --git a/arch/arm/boards/pm9263/init.c b/arch/arm/boards/pm9263/init.c index 14e821f..486df9a 100644 --- a/arch/arm/boards/pm9263/init.c +++ b/arch/arm/boards/pm9263/init.c @@ -90,7 +90,7 @@ static void pm_add_device_nand(void) } static struct at91_ether_platform_data macb_pdata = { - .flags = AT91SAM_ETHER_RMII, + .is_rmii = 1, .phy_addr = 0, }; diff --git a/arch/arm/boards/pm9g45/init.c b/arch/arm/boards/pm9g45/init.c index 675ebe8..a79b128 100644 --- a/arch/arm/boards/pm9g45/init.c +++ b/arch/arm/boards/pm9g45/init.c @@ -114,7 +114,7 @@ static void __init pm9g45_add_device_usbh(void) {} #endif static struct at91_ether_platform_data macb_pdata = { - .flags = AT91SAM_ETHER_RMII, + .is_rmii = 1, .phy_addr = 0, }; diff --git a/arch/arm/boards/qil-a9260/init.c b/arch/arm/boards/qil-a9260/init.c index 8a12b17..3bec4e2 100644 --- a/arch/arm/boards/qil-a9260/init.c +++ b/arch/arm/boards/qil-a9260/init.c @@ -79,7 +79,7 @@ static void qil_a9260_add_device_mci(void) {} #ifdef CONFIG_CALAO_MB_QIL_A9260 static struct at91_ether_platform_data macb_pdata = { - .flags = AT91SAM_ETHER_RMII, + .is_rmii = 1, .phy_addr = -1, }; diff --git a/arch/arm/boards/tny-a926x/init.c b/arch/arm/boards/tny-a926x/init.c index 270becf..98f1d2b 100644 --- a/arch/arm/boards/tny-a926x/init.c +++ b/arch/arm/boards/tny-a926x/init.c @@ -114,7 +114,7 @@ static void tny_a9260_add_device_nand(void) #ifdef CONFIG_DRIVER_NET_MACB static struct at91_ether_platform_data macb_pdata = { - .flags = AT91SAM_ETHER_RMII, + .is_rmii = 1, .phy_addr = -1, }; diff --git a/arch/arm/boards/usb-a926x/init.c b/arch/arm/boards/usb-a926x/init.c index e57591b..8f57aa4 100644 --- a/arch/arm/boards/usb-a926x/init.c +++ b/arch/arm/boards/usb-a926x/init.c @@ -114,7 +114,7 @@ static void usb_a9260_add_device_nand(void) } static struct at91_ether_platform_data macb_pdata = { - .flags = AT91SAM_ETHER_RMII, + .is_rmii = 1, .phy_addr = -1, }; diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c index a676436..4751664 100644 --- a/arch/arm/mach-at91/at91rm9200_devices.c +++ b/arch/arm/mach-at91/at91rm9200_devices.c @@ -91,7 +91,7 @@ void __init at91_add_device_eth(int id, struct at91_ether_platform_data *data) at91_set_A_periph(AT91_PIN_PA8, 0); /* ETXEN */ at91_set_A_periph(AT91_PIN_PA7, 0); /* ETXCK_EREFCK */ - if (!(data->flags & AT91SAM_ETHER_RMII)) { + if (!data->is_rmii) { at91_set_B_periph(AT91_PIN_PB19, 0); /* ERXCK */ at91_set_B_periph(AT91_PIN_PB18, 0); /* ECOL */ at91_set_B_periph(AT91_PIN_PB17, 0); /* ERXDV */ diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index eedb495..4e67126 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c @@ -90,7 +90,7 @@ void at91_add_device_eth(int id, struct at91_ether_platform_data *data) at91_set_A_periph(AT91_PIN_PA21, 0); /* EMDIO */ at91_set_A_periph(AT91_PIN_PA20, 0); /* EMDC */ - if (!(data->flags & AT91SAM_ETHER_RMII)) { + if (!data->is_rmii) { at91_set_B_periph(AT91_PIN_PA28, 0); /* ECRS */ at91_set_B_periph(AT91_PIN_PA29, 0); /* ECOL */ at91_set_B_periph(AT91_PIN_PA25, 0); /* ERX2 */ diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c index 45fbb9b..be89bc6 100644 --- a/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c @@ -97,7 +97,7 @@ void at91_add_device_eth(int id, struct at91_ether_platform_data *data) at91_set_A_periph(AT91_PIN_PE30, 0); /* EMDIO */ at91_set_A_periph(AT91_PIN_PE29, 0); /* EMDC */ - if (!(data->flags & AT91SAM_ETHER_RMII)) { + if (!data->is_rmii) { at91_set_A_periph(AT91_PIN_PE22, 0); /* ECRS */ at91_set_B_periph(AT91_PIN_PC26, 0); /* ECOL */ at91_set_B_periph(AT91_PIN_PC22, 0); /* ERX2 */ diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index 73bac9f..89d5689 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c @@ -73,7 +73,7 @@ void at91_add_device_eth(int id, struct at91_ether_platform_data *data) at91_set_A_periph(AT91_PIN_PA19, 0); /* EMDIO */ at91_set_A_periph(AT91_PIN_PA18, 0); /* EMDC */ - if (!(data->flags & AT91SAM_ETHER_RMII)) { + if (!data->is_rmii) { at91_set_B_periph(AT91_PIN_PA29, 0); /* ECRS */ at91_set_B_periph(AT91_PIN_PA30, 0); /* ECOL */ at91_set_B_periph(AT91_PIN_PA8, 0); /* ERX2 */ diff --git a/arch/arm/mach-at91/at91sam9x5_devices.c b/arch/arm/mach-at91/at91sam9x5_devices.c index 0909461..bfb22fd 100644 --- a/arch/arm/mach-at91/at91sam9x5_devices.c +++ b/arch/arm/mach-at91/at91sam9x5_devices.c @@ -85,7 +85,7 @@ void at91_add_device_eth(int id, struct at91_ether_platform_data *data) at91_set_A_periph(AT91_PIN_PB5, 0); /* EMDIO */ at91_set_A_periph(AT91_PIN_PB6, 0); /* EMDC */ - if (!(data->flags & AT91SAM_ETHER_RMII)) { + if (!data->is_rmii) { at91_set_A_periph(AT91_PIN_PB16, 0); /* ECRS */ at91_set_A_periph(AT91_PIN_PB17, 0); /* ECOL */ at91_set_A_periph(AT91_PIN_PB13, 0); /* ERX2 */ @@ -98,7 +98,7 @@ void at91_add_device_eth(int id, struct at91_ether_platform_data *data) break; case 1: start = AT91SAM9X5_BASE_EMAC1; - if (!(data->flags & AT91SAM_ETHER_RMII)) + if (!data->is_rmii) pr_warn("AT91: Only RMII available on interface macb%d.\n", id); /* Pins used for RMII */ diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h index dcea9f3..433915f 100644 --- a/arch/arm/mach-at91/include/mach/board.h +++ b/arch/arm/mach-at91/include/mach/board.h @@ -63,14 +63,13 @@ struct atmel_nand_data { void at91_add_device_nand(struct atmel_nand_data *data); /* Ethernet (EMAC & MACB) */ -#define AT91SAM_ETHER_MII (0 << 0) -#define AT91SAM_ETHER_RMII (1 << 0) -#define AT91SAM_ETHER_FORCE_LINK (1 << 1) -#define AT91SAM_ETX2_ETX3_ALTERNATIVE (1 << 2) +#define AT91SAM_ETX2_ETX3_ALTERNATIVE (1 << 0) struct at91_ether_platform_data { + unsigned int phy_flags; unsigned int flags; int phy_addr; + int is_rmii; int (*get_ethaddr)(struct eth_device*, unsigned char *adr); }; diff --git a/drivers/net/at91_ether.c b/drivers/net/at91_ether.c index 90fabab..f6ce0a1 100644 --- a/drivers/net/at91_ether.c +++ b/drivers/net/at91_ether.c @@ -346,7 +346,7 @@ static int at91_ether_probe(struct device_d *dev) mac_cfg |= AT91_EMAC_CLK_DIV32 | AT91_EMAC_BIG; - if (pdata->flags & AT91SAM_ETHER_RMII) { + if (pdata->is_rmii) { ether_dev->interface = PHY_INTERFACE_MODE_RGMII; mac_cfg |= AT91_EMAC_RMII; } else { diff --git a/drivers/net/macb.c b/drivers/net/macb.c index d25fb79..1d37251 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -444,13 +444,12 @@ static int macb_probe(struct device_d *dev) macb->miibus.priv = macb; macb->miibus.parent = dev; - if (pdata->flags & AT91SAM_ETHER_RMII) + if (pdata->is_rmii) macb->interface = PHY_INTERFACE_MODE_RMII; else macb->interface = PHY_INTERFACE_MODE_MII; - macb->phy_flags = pdata->flags & AT91SAM_ETHER_FORCE_LINK ? - PHYLIB_FORCE_LINK : 0; + macb->phy_flags = pdata->phy_flags; macb->rx_buffer = dma_alloc_coherent(CFG_MACB_RX_BUFFER_SIZE); macb->rx_ring = dma_alloc_coherent(CFG_MACB_RX_RING_SIZE * sizeof(struct macb_dma_desc)); -- 1.7.10.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] at91sam9260ek: specify mach entry 2012-11-16 17:19 [PATCH 1/1] at91sam9260ek: specify mach entry Jean-Christophe PLAGNIOL-VILLARD ` (2 preceding siblings ...) 2012-11-16 17:19 ` [PATCH 3/3] macb/ether: split flags for drivers and phylib Jean-Christophe PLAGNIOL-VILLARD @ 2012-11-19 9:20 ` Sascha Hauer 2012-11-19 9:56 ` Jean-Christophe PLAGNIOL-VILLARD 3 siblings, 1 reply; 7+ messages in thread From: Sascha Hauer @ 2012-11-19 9:20 UTC (permalink / raw) To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox On Fri, Nov 16, 2012 at 06:19:50PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote: > as the sam9260ek may not be the first one in the list > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > --- > arch/arm/configs/at91sam9260ek_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig > index b746bc8..9c5c7d5 100644 > --- a/arch/arm/configs/at91sam9260ek_defconfig > +++ b/arch/arm/configs/at91sam9260ek_defconfig > @@ -1,4 +1,5 @@ > CONFIG_ARCH_AT91SAM9260=y > +CONFIG_MACH_AT91SAM9260EK=y Won't this be removed again when we regenerate this file with make safedefconfig? It seems a bit fragile to keep this change manually. I have no good idea how to do this better though. Applied the rest of this series for now. Sascha > CONFIG_AEABI=y > # CONFIG_CMD_ARM_CPUINFO is not set > CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y > -- > 1.7.10.4 > > > _______________________________________________ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] at91sam9260ek: specify mach entry 2012-11-19 9:20 ` [PATCH 1/1] at91sam9260ek: specify mach entry Sascha Hauer @ 2012-11-19 9:56 ` Jean-Christophe PLAGNIOL-VILLARD 2012-11-19 10:24 ` Sascha Hauer 0 siblings, 1 reply; 7+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-11-19 9:56 UTC (permalink / raw) To: Sascha Hauer; +Cc: barebox On 10:20 Mon 19 Nov , Sascha Hauer wrote: > > On Fri, Nov 16, 2012 at 06:19:50PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote: > > as the sam9260ek may not be the first one in the list > > > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > > --- > > arch/arm/configs/at91sam9260ek_defconfig | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig > > index b746bc8..9c5c7d5 100644 > > --- a/arch/arm/configs/at91sam9260ek_defconfig > > +++ b/arch/arm/configs/at91sam9260ek_defconfig > > @@ -1,4 +1,5 @@ > > CONFIG_ARCH_AT91SAM9260=y > > +CONFIG_MACH_AT91SAM9260EK=y > > Won't this be removed again when we regenerate this file with make > safedefconfig? It seems a bit fragile to keep this change manually. I > have no good idea how to do this better though. > the isssue that I'm going to add a new board that will be named animeo-ip so the at91sam9260ek will be broken as it will be configured as the animeo-ip Best Regards, J. > > Applied the rest of this series for now. > > Sascha > > > CONFIG_AEABI=y > > # CONFIG_CMD_ARM_CPUINFO is not set > > CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y > > -- > > 1.7.10.4 > > > > > > _______________________________________________ > > barebox mailing list > > barebox@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/barebox > > > > -- > Pengutronix e.K. | | > Industrial Linux Solutions | http://www.pengutronix.de/ | > Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] at91sam9260ek: specify mach entry 2012-11-19 9:56 ` Jean-Christophe PLAGNIOL-VILLARD @ 2012-11-19 10:24 ` Sascha Hauer 0 siblings, 0 replies; 7+ messages in thread From: Sascha Hauer @ 2012-11-19 10:24 UTC (permalink / raw) To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox On Mon, Nov 19, 2012 at 10:56:11AM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote: > On 10:20 Mon 19 Nov , Sascha Hauer wrote: > > > > On Fri, Nov 16, 2012 at 06:19:50PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote: > > > as the sam9260ek may not be the first one in the list > > > > > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > > > --- > > > arch/arm/configs/at91sam9260ek_defconfig | 1 + > > > 1 file changed, 1 insertion(+) > > > > > > diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig > > > index b746bc8..9c5c7d5 100644 > > > --- a/arch/arm/configs/at91sam9260ek_defconfig > > > +++ b/arch/arm/configs/at91sam9260ek_defconfig > > > @@ -1,4 +1,5 @@ > > > CONFIG_ARCH_AT91SAM9260=y > > > +CONFIG_MACH_AT91SAM9260EK=y > > > > Won't this be removed again when we regenerate this file with make > > safedefconfig? It seems a bit fragile to keep this change manually. I > > have no good idea how to do this better though. > > > the isssue that I'm going to add a new board that will be named animeo-ip > > so the at91sam9260ek will be broken as it will be configured as the animeo-ip Can you resend this patch then along with the animeo-ip patches? At that point we can be sure that the next at91sam9260ek config generated with make savedefconfig will be correct. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-11-19 10:24 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-11-16 17:19 [PATCH 1/1] at91sam9260ek: specify mach entry Jean-Christophe PLAGNIOL-VILLARD 2012-11-16 17:19 ` [PATCH 1/3] phylib: export phy_id via param Jean-Christophe PLAGNIOL-VILLARD 2012-11-16 17:19 ` [PATCH 2/3] phylib: introduction of forced 100Mbps Jean-Christophe PLAGNIOL-VILLARD 2012-11-16 17:19 ` [PATCH 3/3] macb/ether: split flags for drivers and phylib Jean-Christophe PLAGNIOL-VILLARD 2012-11-19 9:20 ` [PATCH 1/1] at91sam9260ek: specify mach entry Sascha Hauer 2012-11-19 9:56 ` Jean-Christophe PLAGNIOL-VILLARD 2012-11-19 10:24 ` Sascha Hauer
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox