Commit 53ac0936 authored by Alessandro Rubini's avatar Alessandro Rubini

config: rename CONFIG_ETHERBONE to CONFIG_IP

Actually, Etherbone is in gateware, and this option only enables Internet
Protocol in the software.  This fixes a long-standing misunderstanding.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 014c5b4c
......@@ -58,13 +58,13 @@ config W1
# The other ones can be set by non-developers
config ETHERBONE
config IP
depends on WR_NODE
boolean "Compile Etherbone support in wrpc-sw"
boolean "Compile minimal IP support in wrpc-sw"
help
This allows to run LM32 code that is aware of Etherbone.
You need to run a gateware file that includes Etherbone support.
If in doubt, say No.
This allows to run LM32 code that is aware of IP. The feature is
needed to run Etherbone in your gateware, because Etherbone
is UDP-based and thus the CPU needs to run DHCP.
config CMD_CONFIG
depends on WR_NODE
......
......@@ -61,7 +61,7 @@ LDFLAGS_PLATFORM = -mmultiply-enabled -mbarrel-shift-enabled \
# packet-filter rules depend on configuration; default is rules-plain
pfilter-y := rules-plain.bin
pfilter-$(CONFIG_ETHERBONE) := rules-ebone.bin
pfilter-$(CONFIG_IP) := rules-ebone.bin
pfilter-$(CONFIG_NIC_PFILTER) := rules-e+nic.bin
export pfilter-y
......@@ -112,7 +112,7 @@ all: tools $(OUTPUT).ram $(OUTPUT).vhd $(OUTPUT).mif
# we need to remove "ptpdump" support for ppsi if RAM size is small and
# we include etherbone
ifneq ($(CONFIG_RAMSIZE),131072)
ifdef CONFIG_ETHERBONE
ifdef CONFIG_IP
PPSI_USER_CFLAGS = -DCONFIG_NO_PTPDUMP
endif
endif
......
......@@ -11,7 +11,7 @@ CONFIG_STACKSIZE=2048
CONFIG_PPSI=y
CONFIG_UART=y
CONFIG_W1=y
# CONFIG_ETHERBONE is not set
# CONFIG_IP is not set
# CONFIG_CMD_CONFIG is not set
#
......
......@@ -11,7 +11,7 @@ CONFIG_STACKSIZE=10240
CONFIG_PPSI=y
CONFIG_UART=y
CONFIG_W1=y
CONFIG_ETHERBONE=y
CONFIG_IP=y
CONFIG_CMD_CONFIG=y
#
......
......@@ -9,7 +9,7 @@ CONFIG_STACKSIZE=2048
CONFIG_PPSI=y
CONFIG_UART=y
CONFIG_W1=y
# CONFIG_ETHERBONE is not set
# CONFIG_IP is not set
# CONFIG_CMD_CONFIG is not set
#
......
......@@ -9,7 +9,7 @@ CONFIG_STACKSIZE=2048
CONFIG_PPSI=y
CONFIG_UART=y
CONFIG_W1=y
CONFIG_ETHERBONE=y
CONFIG_IP=y
CONFIG_NIC_PFILTER=y
# CONFIG_CMD_CONFIG is not set
......
......@@ -833,7 +833,7 @@ initialization script
@item @code{sdb} @tab prints devices connected to the Wishbone bus inside @sc{wrpc}
@item @code{ip get}
@item @code{ip set <ip>} @tab reports or sets the IPv4 address of the @sc{wrpc} (only available if @t{CONFIG_ETHERBONE} is set at build time
@item @code{ip set <ip>} @tab reports or sets the IPv4 address of the @sc{wrpc} (only available if @t{CONFIG_IP} is set at build time
@item @code{w1w <offset> <byte> [<byte> ...]}
@item @code{w1r <offset> <len>} @tab If @t{CONFIG_W1} is set and a OneWire @sc{eeprom} exists, write and read data. For writing, @t{byte} values are decimal
......
......@@ -2,4 +2,4 @@ obj-y += lib/util.o lib/atoi.o
obj-y += lib/usleep.o
obj-$(CONFIG_WR_NODE) += lib/net.o
obj-$(CONFIG_ETHERBONE) += lib/arp.o lib/icmp.o lib/ipv4.o lib/bootp.o
obj-$(CONFIG_IP) += lib/arp.o lib/icmp.o lib/ipv4.o lib/bootp.o
......@@ -90,7 +90,7 @@ void wrc_mon_gui(void)
int aux_stat;
uint64_t sec;
uint32_t nsec;
#ifdef CONFIG_ETHERBONE
#ifdef CONFIG_IP
uint8_t ip[4];
#endif
struct wr_servo_state *s =
......@@ -155,7 +155,7 @@ void wrc_mon_gui(void)
cprintf(C_GREEN, "Calibrated ");
else
cprintf(C_RED, "Uncalibrated ");
#ifdef CONFIG_ETHERBONE
#ifdef CONFIG_IP
cprintf(C_WHITE, "\nIPv4: ");
getIP(ip);
if (needIP)
......
......@@ -16,7 +16,7 @@ obj-$(CONFIG_WR_NODE) += \
shell/cmd_help.o \
shell/cmd_refresh.o
obj-$(CONFIG_ETHERBONE) += shell/cmd_ip.o
obj-$(CONFIG_IP) += shell/cmd_ip.o
obj-$(CONFIG_PPSI) += shell/cmd_verbose.o
obj-$(CONFIG_CMD_CONFIG) += shell/cmd_config.o
obj-$(CONFIG_CMD_SLEEP) += shell/cmd_sleep.o
......
......@@ -90,7 +90,7 @@ static void wrc_initialize(void)
calib_t24p(WRC_MODE_MASTER, &cal_phase_transition);
spll_very_init();
#ifdef CONFIG_ETHERBONE
#ifdef CONFIG_IP
ipv4_init();
arp_init();
#endif
......@@ -199,7 +199,7 @@ int main(void)
}
switch (l_status) {
#ifdef CONFIG_ETHERBONE
#ifdef CONFIG_IP
case LINK_WENT_UP:
needIP = 1;
break;
......@@ -207,7 +207,7 @@ int main(void)
case LINK_UP:
update_rx_queues();
#ifdef CONFIG_ETHERBONE
#ifdef CONFIG_IP
ipv4_poll();
arp_poll();
#endif
......
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