diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/env_nand.c | 2 | ||||
| -rw-r--r-- | common/usb.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/common/env_nand.c b/common/env_nand.c index 2682f07..a4480cb 100644 --- a/common/env_nand.c +++ b/common/env_nand.c @@ -205,7 +205,7 @@ int saveenv(void) return 1; } env_new.crc = crc32(0, env_new.data, ENV_SIZE); - env_new.flags = ACTIVE_FLAG; + ++env_new.flags; /* increase the serial */ if(gd->env_valid == 1) { puts("Erasing redundant NAND...\n"); diff --git a/common/usb.c b/common/usb.c index 10e23de..44a435a 100644 --- a/common/usb.c +++ b/common/usb.c @@ -55,7 +55,10 @@ #include <asm/4xx_pci.h> #endif -#undef USB_DEBUG +#ifdef DEBUG +#define USB_DEBUG +#define USB_HUB_DEBUG +#endif #ifdef USB_DEBUG #define USB_PRINTF(fmt, args...) printf(fmt , ##args) @@ -960,8 +963,6 @@ void usb_scan_devices(void) * Probes device for being a hub and configurate it */ -#undef USB_HUB_DEBUG - #ifdef USB_HUB_DEBUG #define USB_HUB_PRINTF(fmt, args...) printf(fmt , ##args) #else @@ -1220,7 +1221,7 @@ int usb_hub_configure(struct usb_device *dev) hub->desc.DeviceRemovable[i] = descriptor->DeviceRemovable[i]; for (i = 0; i < ((hub->desc.bNbrPorts + 1 + 7)/8); i++) - hub->desc.DeviceRemovable[i] = descriptor->PortPowerCtrlMask[i]; + hub->desc.PortPowerCtrlMask[i] = descriptor->PortPowerCtrlMask[i]; dev->maxchild = descriptor->bNbrPorts; USB_HUB_PRINTF("%d ports detected\n", dev->maxchild); |