include/bitfield.h: Assure new bitfield value doesn't touch unwanted bits

[karo-tx-uboot.git] / common / cmd_universe.c

diff --git a/common/cmd_universe.c b/common/cmd_universe.c
index ea977828a05e35c359c4b3765e86f03601d3a3ee..c9310363f10edb53ea1b81e910fd41dc7b0ba513 100644 (file)
--- a/common/cmd_universe.c
+++ b/common/cmd_universe.c
@@ -1,23 +1,7 @@
 /*
  * (C) Copyright 2003 Stefan Roese, stefan.roese@esd-electronics.com
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -46,7 +30,7 @@ static UNI_DEV   *dev;
 
 int universe_init(void)
 {
-       int j, result, lastError = 0;
+       int j, result;
        pci_dev_t busdevfn;
        unsigned int val;
 
@@ -126,8 +110,6 @@ int universe_init(void)
  break_30:
        free(dev);
  break_20:
-       lastError = result;
-
        return result;
 }
 
@@ -317,7 +299,7 @@ int universe_vme_slave_window(unsigned int vmeAddr, unsigned int pciAddr, int si
 /*
  * Tundra Universe configuration
  */
-int do_universe(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_universe(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        ulong addr1 = 0, addr2 = 0, size = 0, vam = 0, pms = 0, vdw = 0;
        char cmd = 'x';
@@ -364,7 +346,7 @@ int do_universe(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        universe,       8,      1,      do_universe,
-       "universe- initialize and configure Turndra Universe\n",
+       "initialize and configure Turndra Universe",
        "init\n"
        "    - initialize universe\n"
        "universe vme [vme_addr] [pci_addr] [size] [vam] [pms]\n"
@@ -382,5 +364,5 @@ U_BOOT_CMD(
        "                                      03 -> Configuration Space\n"
        "    [vdw] = VMEbus Maximum Datawidth: 01 -> D8 Data Width\n"
        "                                      02 -> D16 Data Width\n"
-       "                                      03 -> D32 Data Width\n"
+       "                                      03 -> D32 Data Width"
 );