summaryrefslogtreecommitdiff
path: root/cleopatre/tools
diff options
context:
space:
mode:
authorlefranc2010-01-08 12:58:51 +0000
committerlefranc2010-01-08 12:58:51 +0000
commit7596b9f14642740e71860b6b8341d5dc66213934 (patch)
treef3ee9590c0c21f54db5ba27cf8a01e7799f64968 /cleopatre/tools
parent4663c62f07f23bfb8afbc2465867bf8f45655b2d (diff)
cleo/tools/genNVRAM: small cosmetic fixes
- use general nvram.h instead of linux's one - comments added or fixed git-svn-id: svn+ssh://pessac/svn/cesar/trunk@6598 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cleopatre/tools')
-rw-r--r--cleopatre/tools/genNVRAM/Makefile2
-rw-r--r--cleopatre/tools/genNVRAM/genNVRAM.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/cleopatre/tools/genNVRAM/Makefile b/cleopatre/tools/genNVRAM/Makefile
index fad03d7cb8..333ff14a6b 100644
--- a/cleopatre/tools/genNVRAM/Makefile
+++ b/cleopatre/tools/genNVRAM/Makefile
@@ -19,7 +19,7 @@
TOPDIR=../..
LINUX_DIR=$(TOPDIR)/linux-2.6.25.10-spc300
-CFLAGS= -I$(LINUX_DIR)/include
+CFLAGS= -I$(LINUX_DIR)/include -I$(TOPDIR)/include
all: genNVRAM
diff --git a/cleopatre/tools/genNVRAM/genNVRAM.c b/cleopatre/tools/genNVRAM/genNVRAM.c
index e7a817a8e3..57d0401d00 100644
--- a/cleopatre/tools/genNVRAM/genNVRAM.c
+++ b/cleopatre/tools/genNVRAM/genNVRAM.c
@@ -34,7 +34,7 @@
#include <linux/if_ether.h>
#include <errno.h>
-#include "asm-arm/arch-spc300/nvram.h"
+#include "nvram.h"
#define DEFAULT_PKG_CFG 0x0000024e
#define DEFAULT_GPIO_0_7_CFG 0x11331111
@@ -102,10 +102,10 @@ static spc300_nvram_t nvram = {
.product_desc = DEFAULT_PRODUCT_DESC, /* product serial number in string format */
.serial_number = DEFAULT_SERIAL_NUMBER, /* ethernet MAC address */
.eth_phy_addr = DEFAULT_ETH_PHY_ADDR, /* address of Ethernet PHY */
- .eth_address = DEFAULT_ETH_ADDRESS,
+ .eth_address = DEFAULT_ETH_ADDRESS, /* ethernet MAC address */
.plc_address = DEFAULT_PLC_ADDRESS, /* powerline MAC address */
- .device_password = DEFAULT_DEVICE_PASSWORD,
- .oem_info = DEFAULT_OEM_INFO, /* HomeplugAV device unique password (DPW) */
+ .device_password = DEFAULT_DEVICE_PASSWORD,/* HomeplugAV device unique password (DPW) */
+ .oem_info = DEFAULT_OEM_INFO,
.tonemask = DEFAULT_TONEMASK,
.manufactory_info = DEFAULT_MANUFACTORY_INFO,
};